Hi Rusi, Cc:ing the main Git list, as some of this has been discussed at the GitMerge in Paris, and some participants of that discussion might want to join this thread. On 2015-06-19 14:55, Rusi Mody wrote: > Trying to setup git. > Majority folks are MS VS users but also some *nixers. > > My current understanding/analysis of the situation: > > 1. autocrlf is broken -- keep it false > 2. safecrlf is a cure (to some extent) -- keep it true > 3. core.eol can be left native (or is crlf on windows/lf on *nix > preferred??) > > And of course most crucial: > 4. Make sure ALL file types are covered in .gitattributes; eg > > *.txt text > *.cs text > : > : > *.pdf binary > etc > > Still when we get a merge conflict the file (created by git with conflict > markers) shows ^M in vi > ie I assume its unclean line endings. > > Any tips what to do? The most important preliminary question is: how cross platform is your project? If there is no risk of any developer working on a non-Windows platform, you could simply commit CRLF and be done with it. As to autocrlf: I actually had some good experience with setting it to `input` when working with other developers. Ciao, Johannes -- To unsubscribe from this list: send the line "unsubscribe git" in