<p>When merging topic branch &quot;B&quot; into &quot;A&quot; using <code>git merge</code>, I get some conflicts. I know all the conflicts can be solved using the version in &quot;B&quot;.</p>
<p>I am aware of <code>git merge -s ours</code>. But what I want is something like <code>git merge -s theirs</code>.</p>
<p>Why doesn't it exist? How can I achieve the same result after the conflicting merge with existing <code>git</code> commands? (<code>git checkout</code> every unmerged file from B)</p>
<p>The &quot;solution&quot; of just discarding anything from branch A (the merge commit point to B version of the tree) is not what I am looking for.</p>

I solved my problem using
```
```
git checkout -m old
git checkout -b new B
git merge -s ours old
```
```