title: Have a feature branch in git and can't merge master after reverting a merge from a different branch
body: <p>We have implemented a kind of git flow workflow in our company but not everyone is actually using git flow yet so there are some hiccups. Here is one.</p>
  
  <p>A colleague was working on a feature branch and needed some bug fixes that are currently in master and develop. However, he got confused and merged develop into his feature branch instead of master, thus getting a number of unwanted features. He pushed to our git server.</p>
  
  <p>Now, I saw his error and we tried correcting it. We reverted the merge commit </p>
  
  <pre><code>git revert -m 1 hismergecommit
  </code></pre>
  
  <p>and undid his merge. However, if he tries to merge master into his branch, he's told that there's nothing to merge! This appears to be due to the fact that master had previously been merged into development, prior to his gaff. </p>
  
  <p><img src="https://i.stack.imgur.com/NHLBJ.png" alt="enter image description here"></p>
  
  <p>The picture gives an idea what it looks like.</p>
  
  <p>Is there a way to merge in master to his feature without reseting his feature branch to before his bad merge or cherry picking all the commits in master?</p>
  
  <p>EDIT:</p>
  
  <p>I'd like to add that although he has pushed the branch to the server, nobody else has pulled it so it isn't "dangerous" to rewrite the history in this case, I'd just like to know if there's a good way to fix these kinds of issues should they arise.</p>