title: git rebase after pull request
body: <p>I have trouble to update a pull request.</p>
  
  <p>What I did: forked a repository, cloned it locally, created a branch (pr-branch) that tracks upstream/master, committed some changes, pushed to origin, opened a pull request.</p>
  
  <p>Now I need to update my pull request but changes have been made by other devs on upstream/master.</p>
  
  <p>So I did :</p>
  
  <ul>
  <li><code>git checkout -b master-updated upstream/master</code></li>
  <li><code>git pull</code></li>
  <li><code>git checkout pr-branch</code></li>
  <li><code>git rebase master-updated</code></li>
  </ul>
  
  <p>I was going to make some changes but git/source tree tells me that origin/pr-branch and pr-branch have diverged : 126 ahead and 1 behind</p>
  
  <p>(I did some rebase before but never saw (or paid attention :-)) this kind of message...)</p>
  
  <p>What I am supposed to do next ?</p>
  
  <p>Make changes, commit then push to origin ?
  Pull (but create a merge commit I guess), commit then push to origin ?</p>
  
  <p>Thanks!</p>