title: Overwrite single file in my current branch with the same file in the main branch?
body: <p>Say I have two branches - <code>master</code> and <code>redesign</code>.  How would I go about overwriting the file <code>default.aspx.cs</code> in my redesign branch with the one from master?</p>
  
  <p>I found <a href="https://stackoverflow.com/questions/692246/how-do-i-revert-one-file-to-the-last-commit-in-git">this question</a> but it seems to go over how to revert a file back to it's previous version in the same branch.  I also considered using a <code>merge</code>, but I don't want to merge, I want to overwrite.  Suggestions?</p>