title: How to rebase a branch that has master merged into it?
body: <p>I've run </p>
  
  <pre><code>git pull origin master 
  </code></pre>
  
  <p>in my dev-branch to merge master into it. Now </p>
  
  <pre><code>git rebase -i origin/master
  </code></pre>
  
  <p>says there's merge conflicts that are not real. Incoming change is the 1st commit in the dev-branch (before the merge) and not current situation of the dev-branch. </p>
  
  <p>Current situation of the dev-branch does not have any conflicts with master because master is just merged. The problem is that git thinks there is merge conflicts cause it compares master with old version of the dev-branch. i.e. 1st commit which in this case is also the commit just before merging master into it.</p>
  
  <p>So how this should be done?</p>