title: How to continue with the merge if all the conflicts can be resolved by checking out theirs?
body: <p>I'm merging my files up to a remote repo. </p>
  
  <p>I get merge conflicts when I push it up. Weirdly, these are all files I never touched in my branch (but thats probably for another post).</p>
  
  <p>I <code>git checkout --theirs</code> to all these files.</p>
  
  <p>Then I <code>git commit</code>.</p>
  
  <p>But I am unsure what to do next. </p>
  
  <p>If I <code>git push</code> I just get another merge error with the same files.</p>
  
  <p><code>git merge --continue</code> doesn't work on my version of git.</p>
  
  <p>Would any one know what I should be doing next?</p>