title: git: fatal: '--ours/--theirs' cannot be used with switching branches
body: <p>In a merge conflict, I'm trying to resolve all the merge conflicts in favour of a particular branch.</p>
  
  <p>I'm trying to do <code>git checkout --ours</code>, but I get the following error:</p>
  
  <pre><code>fatal: '--ours/--theirs' cannot be used with switching branches
  </code></pre>
  
  <p>How can I achieve what I'm trying to do?</p>