title: Merge conflict after git pull: Forget about the local version and take the remote one...how?
body: <p>I cloned a repo, build a firmware from that and 'git pull' from time to time to stay uptodate.</p>
  <p>This time I got a merge conflict for a very huge file (json), which - as it turned out - is automatically created, when the firmware is built. So the conflicts are there - from point of view of git - but they don't matter. I simply want the version from the repo replacing the local one.</p>
  <p>I tried <code>git merge -s theirs</code> but this strategy is not known by <code>git merge</code>. I removed the file physically to get a fresh copy....nope...git is smarter than me.</p>
  <p>How can I do a 'forget that file and send me the copy you have' to the remote git?</p>