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 will merge your newBranch in existing baseBranch

git checkout  // this will checkout baseBranch
git merge -s ours  // this will simple merge newBranch in baseBranch
git rm -rf . // this will remove all non references files from baseBranch (deleted in newBranch)
git checkout newBranch -- . //this will replace all conflicted files in baseBranch