title: Cannot merge after git revert -m 1
body: <p>I accidentially merged the branch dev into the branch master and did push. </p>
  
  <p>Master was behind dev some commits ~169. </p>
  
  <p>I'm no expert in git so I read up a bit on how to revert a merge and tried git revert -m 1  which looked good. Master doesn't contain the changes dev contains. </p>
  
  <p>Also those changes have been pushed to remote.</p>
  
  <p>So first I thought all went well...</p>
  
  <p>But then I recognized it's not possible to merge dev into master again to get those changes to master which now is needed (after a successful release). This means when I do the merge from dev to master git doesn't recognize any changes on master...</p>
  
  <p>I'm really confused and hope someone can help me with this huge problem.</p>
  
  <p>Thanks in advance!
  Gerrit</p>
  
  <p>Edit:
  would a git reset --hard "commit before merge" solve this problem?</p>