title: How do I revert a git merge that had many commits
body: <p>I have two branches <code>new-ui</code> and <code>video-upload</code> and I am trying to merge them. Before merging them though, I should have created a new branch that holds the result of both....to make sure that the merge result is what I am looking for. I didn't, so I would like to reverse the entire merge (ideally without having to go back through the logs and do it manually).</p>
  
  <p>Both branches, post the fork, have had changes/commits applied to them. So, as you can imagine, the history of both is quite messy.</p>
  
  <p>I want to just revert <code>new-ui</code> to the state it was at before I just merged <code>video-upload</code> to it. Then I can go ahead and create a new branch then do the merge there.</p>
  
  <p>What's the best way to do this?</p>