title: Rollback to Previous Commit - Github for MAC (a revert is already in progress)
body: <p>I think I've messed up here.</p>
  
  <p>I made a few changes to my code  from a last commit adding new functionalities and realized that some other piece of code was now acting strangely. I decided to Roll back to an old commit (pushed to remote as well) in order to test if that functionality was working by then.</p>
  
  <p>Before I pressed Rollback, I committed my currently made changes because I did not want to lose them. After committing (not pushing to remote), I did the rollback to that old commit. (note that there were quite a few commits inbetween the commit i roll backed to and the one i committed just now).</p>
  
  <p>All worked fine and my code reverted to that commit. The functionality was misbehaving there in that commit as well so I decided to come back to my most recent commit.</p>
  
  <p>However, I knew not how to do that except Rolling Back to the latest commit. But it gave me an error.</p>
  
  <pre><code>error: a cherry-pick or revert is already in progress
  hint: try "git cherry-pick (--continue | --quit | --abort)"
  fatal: revert failed
  (32768)
  </code></pre>
  
  <p>Now, it seems like most of things are back but the current version of code isn't the same as my last commit. It is somewhere in between. =(</p>
  
  <p>What did I do wrong? [I'm not asking out of innocence, I know I did it wrong ;)]</p>
  
  <p>What was the right way of doing it? [I think I should have branched first]</p>