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

<<<< HEAD #Where the conflict starts

#Previous Revision

========== # The point where things look iffy

#Things that changed

>>>>> New Commit # Point where the conflict ends

Mac's Xcode comes with FileMerge which can be accessed on the command line with opendiff.

git mergetool -t opendiff