title: Git ignore remaining merge conflicts
body: <p>After I solved all merge conflicts I care about, I want to merge regardless of all remaining conflicts. I'd like git to keep the files from the branch I want to merge into (<code>--ours</code> strategy).</p>
  
  <p>How can I do that?</p>