title: Why would one use "git merge -s ours"?
body: <p>I understand that the "ours" merge strategy (hear the quotes around <em>merge</em>?) actually does not use any commits from the other branch.</p>
  
  <p>The "ours" strategy is sometimes mentioned as "keeping the other's history". But it records that history as "applied". Weird. <strong>Are there cases where I do want this behaviour?</strong></p>
  
  <p>As an alternative, you could just as well import the other branch and let its history there, where it belongs.</p>
  
  <p>Note that I am asking about the "-s ours" strategy, not the "-X ours" option to "-s recursive" (which is different in that it applies those commits that don't conflict).</p>