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

You can configure a (graphical) merge tool and use that tool to do the conflict resolution.

Also have a look at the git mergetool command - if you have one of the pre-defined tools installed or have configured some other tool, it will open up the tool for resolution http://schacon.github.com/git/git-mergetool.html

If you are interested in GUI tools, you need not worry about what the notations really mean, as the GUI tool will help you to easily make the resolutions. Just understand that the parts marked with ===== and >>>>> are the conflict sections.