title: master branch and 'origin/master' have diverged, how to 'undiverge' branches'?
body: <p>Somehow my <code>master</code> and my <code>origin/master</code> branch have diverged.<br />
  I actually don't want them to diverge.</p>
  <p>How can I view these differences and <strong>merge</strong> them?</p>