title: Merge conflict resolution
body: <p>When there's a merge conflict in Git, junk like the following is inserted into the conflicting files. Three questions:</p>
  
  <ol>
  <li>How do you read these annotations?</li>
  <li>What are some strategies to use when fixing these merge conflicts?</li>
  <li>Is there a GUI tool for Mac that knows how to read these files and display the two versions side-by-side to make it easier to fix the problem?</li>
  </ol>
  
  <p><img src="https://i.stack.imgur.com/mFWUP.png" alt="enter image description here"></p>
  
  <p>Note: In case it's relevant, I am using GitHub's Mac GUI client.</p>