title: Revert changes made by merge
body: <p>The developer was commiting small changes to two files. But during this commit, he had a merge conflict which deleted a lot of stuff (probably didn't have the last up to date version). Then it was pushed to the shared repo and some other developers did some other commits.</p>
  
  <p>Now, we noticed, that the merge deleted the important files, and we want to revert it back.<br>
  How can I do this without losing the changes from the next commits?</p>
  
  <p>I was trying to <code>git revert commitsha</code>, but it didn't bring the changes back. Do I need to revert back the <code>mergesha</code>? How can I determine it?</p>