title: Git Revert has conflicts, when resolved it is not Actually Reverting the Changes?
body: <p>I have identified commit <code>b67564d</code> as the problem. Somehow the user managed to have 3 merges before and 3 merges afterwards. Currently the repo looks like this (Bar, Joe and Bar represent different users):</p>
  
  <pre><code>Foo: Revert "Fixed Satellite"
  ...
  Joe: Merge branch 'master' of github.com:...... (No Files)
  Bar: Merge branch 'master' of github.com:...... (No Files)
  Bar: Merge branch 'master' of github.com:...... (2 Files)
  Bar: Fixed Satellite                            (5 files: b67564d)
  Bar: Merge branch 'master' of github.com:...... (No Files)
  Bar: Merge branch 'master' of github.com:...... (No Files)
  Bar: Merge branch 'playground'                  (No Files)
  </code></pre>
  
  <p>So I run: <code>git revert b67564d</code></p>
  
  <p><code>error: could not revert...
  hint: after resolving the conflicts, mark the corrected paths
  hint: with 'git add &lt;paths&gt;' and commit result</code></p>
  
  <p>So I run: <code>git mergetool</code></p>
  
  <p>So I resolve conflicts (It was a log file that is ignored but keeps finding it's way in)</p>
  
  <p><code>git status</code></p>
  
  <p>Shows Changes to be committed as the 4 files from b67564d excluding the recently merged log file.</p>
  
  <p>So I run <code>git revert --continue</code></p>
  
  <p>Which gives:</p>
  
  <p><code>[master cc8b21b] Revert "Fixed Satellite" 4 files changed</code></p>
  
  <p>Now I look at the Supposedly changed files, and it hasn't changed at all.</p>
  
  <p>Output of <code>git log --graph --oneline</code> as requested:</p>
  
  <pre><code>* cc8b21b Revert "Fixed Satellite"
  * fc06865 Revert "Styled accordian on Enterprise edit page but Error displayed if a table is empty"
  *   ed07e58 Merge branch 'master' of github.com:x/p-o-2
  |\
  | * 84fd05e Added scroll bars to accordian panels for mobile responsiveness (too many columns in tables)
  | *   010deba Merge branch 'master' of github.com:x/p-o-2
  | |\
  | | *   bdcc3ae Merge branch 'master' of github.com:x/p-o-2
  | | |\
  | | * \   e57f0cd Merge branch 'master' of github.com:x/p-o-2
  | | |\ \
  | | * | | b67564d Fixed Satellite
  | | * | |   eaea47a Merge branch 'master' of github.com:x/p-o-2
  | | |\ \ \
  | | * \ \ \   b3d3f0c Merge branch 'master' of github.com:x/p-o-2
  | | |\ \ \ \
  </code></pre>