Is there a “theirs” version of “git merge -s ours”?

Question

When merging topic branch \"B\" into \"A\" using git merge, I get some conflicts. I know all the conflicts can be solved using the version in \"B\".

I a

Answer 1

This one uses a git plumbing command read-tree, but makes for a shorter overall workflow.

git checkout 

git merge --no-commit -s ours 
git read-tree -u --reset 
git commit

# Check your work!
git diff