title: Git. Rebase local branch atop local master. How do I ignore a single files changes?
body: <p>With Git I am on a branch. I am rebasing the branch atop master. There is a conflict that I want to resolve by ignoring the branches version and accepting master's version. How do I indicate I want to use master's version of the file during the rebase-ing.</p>
  
  <p>Thanks,<br>
  Doug</p>