title: Git rebase gets stuck after resolving merge conflict
body: <p>I'm running a rebase that hits a conflict:</p>
  
  <pre><code>$ git rebase master
  First, rewinding head to replay your work on top of it...
  Applying: Better `SelectMotifsView.js`
  Using index info to reconstruct a base tree...
  M       browser/AddLinkView.js
  M       browser/SelectMotifsView.js
  M       browser/index.html
  Falling back to patching base and 3-way merge...
  Auto-merging browser/index.html
  CONFLICT (content): Merge conflict in browser/index.html
  Failed to merge in the changes.
  Patch failed at 0001 Better `SelectMotifsView.js`
  The copy of the patch that failed is found in:
     /Users/dmitry/dev/links/.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".
  </code></pre>
  
  <p>No biggie—I had made a small change that I knew would cause a conflict:</p>
  
  <pre><code>diff --cc browser/index.html
  index ba9c4f3,4c2a1c2..0000000
  --- a/browser/index.html
  +++ b/browser/index.html
  @@@ -40,6 -40,7 +40,10 @@@
                &lt;label&gt;
                    &lt;%= label %&gt;
                    &lt;select class="form-control" name="motif"&gt;
  ++&lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD
  ++=======
  +                     &lt;% console.log(exclude); %&gt;
  ++&gt;&gt;&gt;&gt;&gt;&gt;&gt; Better `SelectMotifsView.js`
                        &lt;% motifs.each(function(motif) { if (!exclude || exclude.indexOf(motif) &lt; 0) { %&gt;
                            &lt;option value="&lt;%= motif.get('id') %&gt;"&gt;&lt;%= motif.get('name') %&gt;&lt;/option&gt;
                        &lt;% } }); %&gt;
  </code></pre>
  
  <p>I want to keep the version from <code>HEAD</code>, which is empty, so I go in and just remove the whole:</p>
  
  <pre><code>++&lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD
  ++=======
  +                     &lt;% console.log(exclude); %&gt;
  ++&gt;&gt;&gt;&gt;&gt;&gt;&gt; Better `SelectMotifsView.js` 
  </code></pre>
  
  <p>I save the file, <code>browser/index.html</code>, then <code>git add browser/index.html</code>:</p>
  
  <pre><code>$ git add browser/index.html
  $ git rebase --continue
  </code></pre>
  
  <p>But then:</p>
  
  <pre><code>Applying: Better `SelectMotifsView.js`
  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>
  
  <p>Never seen this before... <code>git status</code> shows no remaining unresolved paths. What to do? I read on other related questions that this may be a good use of <code>--skip</code>, but this doesn't seem to be a null commit. Or am I wrong?</p>