title: git rebase with conflict not work
body: <p>I have remote repository.
  I do: </p>
  
  <pre><code>git clone https://mylogin@bitbucket.org/mylogin/myrepo.git
  </code></pre>
  
  <p>Clone success.
  I have git tree:<br/>
  C(master)<br/>|&nbsp;&nbsp;&nbsp;&nbsp;B:A<br/>|&nbsp;&nbsp;  /<br/>B&nbsp;/<br/>|<br>A<br>|<br>A0<br>|<br>A01(origin/head)(origin/master)<br>|<br>(some commits)</p>
  
  <p>I need:<br/>
  &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;B:A<br>
  C(master)&nbsp;/&nbsp;</p>
  
  <p>I need rebase branch B  to C(master)
  What I do:</p>
  
  <pre><code>git checkout b1
  Switched to branch 'b1'
  git rebase master
  First, rewinding head to replay your work on top of it...
  Applying: B:A
  Using index info to reconstruct a base tree...
  M   index1.txt
  Falling back to patching base and 3-way merge...
  Auto-merging index1.txt
  CONFLICT (content): Merge conflict in index1.txt
  Failed to merge in the changes.
  Patch failed at 0001 B:A
  The copy of the patch that failed is found in:
     /pth/to dir/.git/rebase-apply/patch
  
  When you have resolved this problem, run "git rebase --continue".
  If you prefer to skip this patch, run "git rebase --skip" instead.
  To check out the original branch and stop rebasing, run "git rebase --abort".
  
  git branch
  * (no branch)
    b1
    master
  </code></pre>
  
  <p>What must I do?
  I can switch in branch b1, resolve conflict and commit, but it not help (I tested it).</p>