Git the whole file marked as conflict

Question

I am new to GIT (from SVN). When I do a merge, the whole file is set as conflicting (not just lines where there is a conflict). This should come from the "end of line" problem between me (Windows) and my partner (Mac), but how to solve this problem?

Answer 1

git -attributes man page

Set the correct attributes to tell Git to normalize line endings.

Answer 2

, core.autocrlf config, ., , git config gitattributes. , , git reset.