title: Pushing local merge commit to modified remote branch
body: <p>I locally merged a feature branch into the master branch and wanted to push. However, while I was merging, the remote master branch had been updated. How do I best deal with this issue?</p>
  <p>As I see it, I can</p>
  <ul>
  <li><strong>undo my local merge</strong> and redo it using the updated remote master</li>
  <li><strong>create a second merge</strong> by joining my local merged master branch and the updated remote master together</li>
  </ul>
  <p>The first option means doing all of the merging work all over again, while the second option makes the git log quite messy by adding a second merge commit.</p>