title: Git merging theirs steps
body: <p>I am dealing with quite a few binary files generated by a program. Auto merging doesn't work well for these files. What I'd like to do when merging, is quite literally take one copy or the other. It's not ideal, but I think it's the best approach.</p>
  
  <p>Now my understanding, is that if I wanted to take a file from the branch I'm merging from, and completely discard our version, I should do:</p>
  
  <pre><code>git merge &lt;branchname&gt;
  git checkout --theirs &lt;filename&gt;
  git add &lt;filename&gt;
  git commit
  </code></pre>
  
  <p>Is this correct, or am I missing something?</p>
  
  <p>I'd like to do it without using .gitignore</p>