title: how to force git pull when resolving pull request conflict
body: <p>I have conflicts when trying to merge a pull-request on github where the repo is clonable from <code>https://github.com/my_production_repo/my_app.git</code>. </p>
  
  <p>So following their docs, I tried to run this on my local (productio_repo) </p>
  
  <pre><code>git checkout -b tmp master
  git pull https://github.com/my_forked_repo/my_app.git master
  </code></pre>
  
  <p>Then I have some conflicts to fix. The issue is that some of the conflicts are related to <code>byte-code files</code>. I want to force my local files to be overwritten by the files from the <code>my_forked_repo</code>, I tried this </p>
  
  <pre><code>git merge -s recursive -X theirs https://github.com/my_forked_repo/my_app.git master
  </code></pre>
  
  <p>but I got <code>https://github.com/my_forked_repo/my_app.git - not something we can merge</code></p>