git all the file marked as conflict

tags:

git
merge

views:

answers:

+1 Q:

git all the file marked as conflict

Hello,

I am new to GIT (from SVN). When I make a merge, all the file is set as conflicted (not only the lines where there is really a conflict). This should come from a "end of line" problem between me (Windows) and my partner (Mac) but how to solve that?

Thanks in advance for your help!

Farf

+1 A:

http://www.kernel.org/pub/software/scm/git/docs/gitattributes.html

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

Amber 2010-06-26 16:53:43

Amber is pointing you to the right place. Have a look at http://stackoverflow.com/questions/170961/whats-the-best-crlf-handling-strategy-with-git for a discussion here on SO concerning CRLF.

labratmatt 2010-06-26 17:14:43

Thanks, I'll look at this.

Farf 2010-06-27 08:02:00

It seems that you must enable the core.autocrlf config option, see e.g. this document and the manual pages for git config and gitattributes. If conflicts occurred then the merge commit shouldn't have been made, and you should be able to revert the partial merge with git reset.

Philipp 2010-06-26 17:28:02

ansaurus

tags:

views:

answers:

git all the file marked as conflict

related questions