title: Remove a file from a git branch but keep it in another?
body: <p>Recently I was working with someone else in 2 different branches on the same project. I accidentally merged the branch <code>develop</code>, which contained his code, into mine. I then saw his files in my merge request and subsequently learnt the hard way that doing </p>
  
  <p><code>git rm HIS_FILES</code></p>
  
  <p>on his unwanted files in my branch, would not only delete them from my branch, but from his too (and the entire git index).</p>
  
  <p>What I want to know is, how would I correctly remove his files from my branch, so that they are not also deleted from his? Do I make a new branch once I realised his files are in my branch? Do I revert to the previous commit before I merged branch <code>develop</code> into my local one?</p>
  
  <p>Thanks for any help</p>