title: Git: Reset a modified file to the state in another branch?
body: <p>Say I created my own branch from <code>develop</code> branch, and modified fileA a few times in a few commits, now I want to revert just this file to the state in <code>develop</code> (without reverting my other changes), is there an easy way of doing this? (I know I could checkout it out from <code>develop</code> and overwrite it in my branch).</p>
  
  <p>Thanks!</p>