title: git merge, keep both
body: <p>For merging I use this to "keep mine"</p>
  
  <pre><code>git merge -X ours foo
  </code></pre>
  
  <p>and this for "keep theirs"</p>
  
  <pre><code>git merge -X theirs foo
  </code></pre>
  
  <p>However on my latest merge it looks best to keep both sides. Does Git have a "strategy" for this, to avoid manually editing the file?</p>