0

I got a merge conflict:

CONFLICT (content): Merge conflict in css/styles.less

But when I run git mergetool, the mergetool is able to automatically merge the files, without conflict. (My mergetool is Visual Studio.) Both versions of the file were changed, but all changes were on different lines, so I expected git to be able to merge the changes automatically (like the mergetool did).

Any ideas what's going on here?

larspars
  • 1,640
  • 1
  • 15
  • 30
  • Did you commited the merge? – ckruczek Sep 16 '15 at 11:53
  • I didn't accidentally commit and hide the problem, if that's what you mean. I'm sure the that the mergetool did the merge, and it did it correctly. I'm surprised that git failed to do so. – larspars Sep 16 '15 at 11:58
  • I mean: After you called `git mergetool` and it merged automatically, did you commited the merge? Or is your question just a general question about why git is not able to merge it automatically? – ckruczek Sep 16 '15 at 12:00
  • It's a general question about why git didn't merge automatically. I committed without problem after merging :) – larspars Sep 16 '15 at 12:04

0 Answers0