title: Accidentally merged in wrong branch to mine. Is there a way to remove these unwanted files?
body: <p>I accidentally merged a co-workers branch into the branch I was working on. I've made several commits since then so ideally I don't want to revert to the state the branch was before the merge. However, I haven't done anything that has altered his files.</p>
  
  <p>Is there a way I can remove his branch's files from mine?</p>
  
  <p>(Sorry, I am new to git - hope I've got the terminology down).</p>