title: git rebase --continue won't work
body: <p>I did <code>git rebase master</code>, fixed the conflicts reported in a file, and then <code>git add</code> the file to resolve the conflict.  Then I did <code>git rebase --continue</code>, and got this:</p>
  
  <blockquote>
    <p>Applying: Fixed unit test</p>
    
    <p>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.</p>
    
    <p>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".</p>
  </blockquote>
  
  <p>Any idea what I am missing here? Should I do git rebase --skip?</p>