title: git merge conflict after git amend - "Your branch and 'origin/master' have diverged"
body: <p>This is what happens:</p>
  
  <ol>
  <li>After a recent commit to remote master, I make a small trivial change to my local repo</li>
  <li>I add <code>git commit --amend</code> and leave the same commit message as HEAD</li>
  <li>I try to push the repo to master with <code>git push</code></li>
  </ol>
  
  <p>And now I get</p>
  
  <pre><code>On branch master
  Your branch and 'origin/master' have diverged,
  and have 1 and 1 different commit each, respectively.
    (use "git pull" to merge the remote branch into yours)
  nothing to commit, working directory clean
  </code></pre>
  
  <p>I want to understand:</p>
  
  <ol>
  <li>Why this exactly happens?</li>
  <li>What can I do to prevent this?</li>
  <li>How do I reconcile master with local after a git amend?</li>
  </ol>