osx - git falsely marks entire file as merge conflict on same platform -

before downvote: i've read through autocrlf posts, nothing helped (we're not cross platform).

edit 2: looks file corrupt. creating new 1 solved problem, guess not git related.

edit: editing , using git diff | cat -t gives like:

diff —git a/css/style.css b/css/style.css index bd9b50a..8f8f7dc 100644 —- a/css/style.css +++ b/css/style.css @@ -1 +1 @@ -/* typo */^m^mbody {^m  font-size: 16px;^m  line-height: 1.5;^m}^m^ma {^m  color: #000;^m  color: #0770b2;^m}^m^m.main-carousel .item .carousel-caption .caption-content h1,^mh1 {^m 

---

edit: not happen in other files of repo

we're 2 guys on os x working git. it's freaking css file being marked merge conflict no obvious reason.

basically, when both work on file , instance both change 2 existing, different lines each , commit, 1 pushes , other 1 pulls, person gets merge conflict entire file.

we've both tried autocrlf auto, input , false, no difference.

strangely, when pull , see conflict message , diff, being output:

diff --cc css/style.css index 10a8242,6b94ef0..0000000 --- a/css/style.css +++ b/css/style.css @@@ -1,1 -1,1 +1,5 @@@ } padding: 15px 0; {x;{b2;0b2;-caption .caption-content h2 {st-child {4d000000', endcolorstr='#00000000',gradienttype=1 ); /* ie6-9 */ } padding: 15px 0; {x;{b2;0b2;-caption .caption-content h2 {st-child {4d000000', endcolorstr='#00000000',gradienttype=1 ); ++<<<<<<< head } padding: 15px 0; {x;{b2;0b2;-caption .caption-content h2 {st-child {4d000000', endcolorstr='#00000000',gradienttype=1 ); /* ie6-9 */ ++======= } padding: 15px 0; {x;{b2;0b2;-caption .caption-content h2 {st-child {4d000000', endcolorstr='#00000000',gradienttype=1 ); ++>>>>>>> 7049454e778aa6c9c85d638f7b3898e55dac38d7 

which absolutely makes no sense because these lines werent affected, dont appear in css file (what hell } padding: 15px 0; {x;{b2;0b2;-caption .caption-content h2 {st-child ? ).

this both our global git config (removed user , colors , stuff):

[apply]     whitespace = fix [core]     excludesfile = ~/.gitignore     whitespace = space-before-tab,-indent-with-non-tab,trailing-space   trustctime = false   precomposeunicode = false     filemode = false     autocrlf = false [diff]     renames = copies [diff "bin"]     textconv = hexdump -v -c [merge]     log = true 

i'm desperate. looks major wrong. we're using 2.8.1.