title: git pull *after* git rebase?
body: <p>I have a feature branch, and a master branch.</p>
  
  <p>Master branch has evolved and I mean to have those updates to diverging as little as possible from master branch.</p>
  
  <p>So I <code>git pull</code> in both branches, <code>git checkout feature/branch</code> and finally <code>git rebase master</code>.</p>
  
  <p>Now here I either expect everything to work smoothly <em>or</em> conflicts showing up that I need to resolve before continuing rebase until all master commits are re-applied successfully on feature branch.</p>
  
  <p>Now what really happened in my case is something I do not understand:</p>
  
  <pre><code>$&gt;git rebase master
  First, rewinding head to replay your work on top of it...
  Applying: myFirstCommitDoneOnTheBranch
  Applying: myOtherCommitDoneOnTheBranch
  $&gt;git status
  On branch feature/branch
  Your branch and 'origin/feature/feature' have diverged,
  and have 27 and 2 different commits each, respectively.
    (use "git pull" to merge the remote branch into yours)
  nothing to commit, working tree clean
  $&gt;git pull
  *load of conflicts*
  </code></pre>
  
  <p>Now, as much as I can understand he load of conflicts after the pull; I do not understand the need for a pull. Logically, it should rollback to master when it got branched, save the commits made on the branch, forward to latest commit on master and then apply the saved commits.</p>
  
  <p>I do not understand to what the <code>Applying</code> message refers to: what is applying the commits on which version?</p>