title: Working on a pull request, while updating master
body: <p>I've been working on my own branch, but then I've got a pull request from someone else which I had to merge to <code>master</code>.</p>
  
  <p>After merging their pull request into <code>master</code>, I couldn't merge my own <code>dev</code> branch into <code>master</code>! So what I've done is:</p>
  
  <pre><code>git fetch &amp;&amp; git rebase origin/master &amp;&amp; git pull &amp;&amp; git push
  </code></pre>
  
  <p>Then my branch's <code>git log</code> looked like this:</p>
  
  <ol>
  <li>My branch's commits.</li>
  <li>The other contributor's commits.</li>
  <li>My branch's commits (from point 1), they repeat themselves.</li>
  </ol>
  
  <p>What am I doing wrong? How do I avoid this issue? How do I fix the mess that I've created in my <code>git log</code>? My whole <code>git log</code> looks horrible because of it..</p>