title: Can't resolve rebase conflict
body: <pre><code>foo:/opt/bar$ git status
  # On branch develop
  nothing to commit (working directory clean)
  
  foo:/opt/bar$ git pull --rebase origin develop
  From ssh://xxx/yyy
  * branch develop -&gt; FETCH_HEAD
  First, rewinding head to replay your work on top of it...
  Applying: Subscription logging added.
  Using index info to reconstruct a base tree...
  &lt;stdin&gt;:120: trailing whitespace.
  * @return integer
  &lt;stdin&gt;:143: trailing whitespace.
  * @return integer
  &lt;stdin&gt;:166: trailing whitespace.
  * @return integer
  &lt;stdin&gt;:189: trailing whitespace.
  * @return integer
  &lt;stdin&gt;:212: trailing whitespace.
  * @return integer
  warning: squelched 3 whitespace errors
  warning: 8 lines add whitespace errors.
  Falling back to patching base and 3-way merge...
  Auto-merging app/config/config.yml
  CONFLICT (content): Merge conflict in app/config/config.yml
  Failed to merge in the changes.
  Patch failed at 0001 Subscription logging added.
  
  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".
  
  foo:/opt/bar$ git status
  # Not currently on any branch.
  # Unmerged paths:
  # (use "git reset HEAD &lt;file&gt;..." to unstage)
  # (use "git add/rm &lt;file&gt;..." as appropriate to mark resolution)
  #
  # both modified: app/config/config.yml
  #
  no changes added to commit (use "git add" and/or "git commit -a")
  
  foo:/opt/bar$ git add -A
  
  foo:/opt/bar$ git status
  # Not currently on any branch.
  nothing to commit (working directory clean)
  
  foo:/opt/bar$ git rebase --continue
  Applying: Subscription logging added.
  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".
  
  foo:/opt/bar$ git add -A
  
  foo:/opt/bar$ git status
  # Not currently on any branch.
  nothing to commit (working directory clean)
  
  foo:/opt/bar$ git rebase --continue
  Applying: Subscription logging added.
  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".
  
  foo:/opt/bar$
  </code></pre>