title: Overwrite a specific conflicting file in git with latest version
body: <p>I have a few commits with several files in my local repository (not pushed yet). When I am doing a git pull in (EGit) it is showing many incoming changes and one file in conflict. I just want to replace this file with incoming changes but do not want other changes in my commits to be replaced. Just a single conflicting file replace. I tried <code>git checkout --theirs filename</code> from git bash followed by <code>git pull</code> resulting in the following message- <code>Automatic merge failed; fix conflicts and then commit the result</code> which is clear but I want to overwrite that conflict with latest one. How can I resolve this?</p>
  
  <p>I don't know is this can be done without a rebase. A similar situation is described <a href="https://stackoverflow.com/questions/8146289/how-to-get-their-changes-in-the-middle-of-conflicting-git-rebase">here</a> but that involves a rebase, which I want to avoid.</p>