title: Git rebase merge conflict cannot continue
body: <p>I'm trying to rebase 'dev' to catch up to 'master' branch. </p>
  
  <pre><code>$ git checkout dev 
  $ git rebase master 
  First, rewinding head to replay your work on top of it...
  Applying: Corrected compilation problems that came from conversion from SVN.
  Using index info to reconstruct a base tree...
  M       src/com/....
  &lt;stdin&gt;:125: trailing whitespace.
  /**
  &lt;stdin&gt;:126: trailing whitespace.
   *
  &lt;stdin&gt;:127: trailing whitespace.
   */
  &lt;stdin&gt;:128: trailing whitespace.
  package com....
  &lt;stdin&gt;:129: trailing whitespace.
  
  warning: squelched 117 whitespace errors
  warning: 122 lines add whitespace errors.
  Falling back to patching base and 3-way merge...
  Auto-merging src/com/....
  CONFLICT (content): Merge conflict in src/com/...
  Failed to merge in the changes.
  Patch failed at 0001 Corrected compilation problems that came from conversion from SVN.
  
  When you have resolved this problem run "git rebase --continue".
  If you would prefer to skip this patch, instead run "git rebase --skip".
  To check out the original branch and stop rebasing run "git rebase --abort".
  
  $ vi src/com/.....   { fixed the merge issue on one file } 
  $ git add -A . 
  $ git rebase --continue 
  src/com/....: needs merge
  You must edit all merge conflicts and then
  mark them as resolved using git add
  $ vi src/com....      { verified, no &gt;&gt;&gt; or &lt;&lt;&lt; left, no merge markers } 
  $ git rebase --continue 
  Applying: Corrected compilation problems that came from conversion from SVN.
  No changes - did you forget to use 'git add'?
  If there is nothing left to stage, chances are that something else
  already introduced the same changes; you might want to skip this patch.
  
  When you have resolved this problem run "git rebase --continue".
  If you would prefer to skip this patch, instead run "git rebase --skip".
  To check out the original branch and stop rebasing run "git rebase --abort".
  </code></pre>
  
  <p>Any ideas?</p>