Merge conflict resolution

Question

When there\'s a merge conflict in Git, junk like the following is inserted into the conflicting files. Three questions:

1. How do you read these annotations?

Answer 1

Everything between <<<<<< and ====== comes from the HEAD revision, which is the committed state before starting the merge operation (git merge will complain if the tree is dirty, so it should be equivalent to your working directory).

The parts between ====== and >>>>>> come from the version being merged. The text after the >>>>>> is the comment of the commit that introduced the conflicting change.

That there is a conflict marker means that the base version of this part of the file is different from both "new" versions. The base version (last common ancestor) is not shown.

If you want a more comfortable merge and have a GUI available, I suggest you take a look at kdiff3.