title: Avoid the effects of a revert commit in another Git branch while merging
body: <p>Working with git flow. We have a co-worker who is not familiar with Git that accidentally merged develop into master yesterday. </p>
  
  <p>Develop has quite a few features that are launching with our next release, requiring a revert on the merge. This has created a commit which undoes all of the changes. When we merge master back into develop, the revert commit is removing code generated by our features.</p>
  
  <p>What is the best way of going about being able to synchronize develop with master's hotfixes, while preserving the new features?</p>
  
  <p>-- Edit --
  Just to clarify, the revert was a <em>revert</em>. I.E. <code>git revert -m 1 &lt;sha&gt;</code>, as the commit had already been pushed to the remote repository.</p>
  
  <p>Since posting this, I've come up with a possible fix, by branching master and reverting the revert, however I'm curious if there are other possibilities that may minimize collision.</p>