title: Made commit while resolving git rebase conflicts, can't continue
body: <p>We were rebasing a git branch, using <code>git rebase master</code>, when some conflicts were thrown. After resolving the conflicts, my coworker (out of habit) did a <code>git commit -am "commit msg"</code> instead of a <code>git add</code> operation. Now, git rebase can not continue. How do I recover from this?</p>
  
  <pre><code>$ git branch 
  * (no branch)
    groups
    groups_bkp
    master
  $ git rebase --continue
  Applying: add and remove participants from group
  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 prefer to skip this patch, run "git rebase --skip" instead.
  To check out the original branch and stop rebasing, run "git rebase --abort".
  </code></pre>