1

I undid an attempted merge conflict using git checkout -m <<filename>> and was surprised to see the conflicts listed as:

<<<<<<< ours
-------
>>>>>>> theirs

instead of:

<<<<<<< HEAD
-------
>>>>>>> branch

Is there a global setting that controls this?

Steve Chambers
  • 37,270
  • 24
  • 156
  • 208
  • 3
    This indicates that Git sees the merge as two branches coming together on a third branch, but it doesn't know which takes precedence. You can do a manual fix or use `git checkout --ours`, for example. – isherwood Jul 07 '15 at 16:04

0 Answers0