title: git rebase not continuing after fixing conflicts
body: <p>I ran a <code>git rebase origin/[branch]</code> on a branch that is the result of merging multiple local branches together during development. As expected I ran into some conflicts and began fixing them. The first several were fine. Git listed the files, I cleaned them up, did the appropriate <code>git add [file]</code> for each one and then did a <code>git rebase --continue</code> and on it went.</p>
  
  <p>But now I've hit a patch that conflicted and is cleaned up but I can't continue for some reason. I've cleaned up the files and all of them are staged but when I <code>git rebase --continue</code> I get:</p>
  
  <pre><code>$ git rebase --continue
  You must edit all merge conflicts and then
  mark them as resolved using git add
  </code></pre>
  
  <p>I know for a fact this commit in question removes a file that was later re-added and modified. But when I <code>git status</code> all I see is:</p>
  
  <pre><code>$ git status
  # Not currently on any branch.
  # Changes to be committed:
  #   (use "git reset HEAD &lt;file&gt;..." to unstage)
  #
  # modified: [file 1]
  # modified: [file 2]
  # modified: [file 3]
  #
  </code></pre>
  
  <p>The file that was deleted is not shown.</p>
  
  <p>So there's no files left to modify but git insists I still have to do something else before I can continue on my way.</p>