title: Possible to resolve Git conflict on single file using Ours / Theirs?
body: <p>I've found many instructions on Stack Overflow and elsewhere for resolving conflicts using the OURS/THEIRS dynamic, in cases where you simply want to overwrite one file with another (particularly binary files). However in almost every example I find, it's always been applied en masse to all conflicts, whereas I only want to apply it to a single conflicted file. </p>
  
  <p>One supposed solution I found is to use the git mergetool command. However the mergetool is giving me issues, where I select "choose left" or "choose right" and nothing happens. </p>
  
  <p>Regardless of mergetool though, I'd like to know anyway if there is a way to do this from the command line. I'm sure there is, and if anyone would let me know the command, or otherwise link me to the SO question I must not be finding, I'd appreciate it greatly. </p>
  
  <p>I've also tried using...</p>
  
  <p>git checkout --theirs PATH/TO/CONFLICTED/FILE</p>
  
  <p>But then when I enter 'git status', it still shows the file as conflicted.</p>
  
  <p>Thank you so much for your time.</p>