The solution is easy, just take the changes from the other branch.
git merge -X theirs other-branch
Wait - but how do you know what changes are incoming, ie. where is the conflict?
You could just try out
git merge other-branch
Some conflicts here, but I DO want to solve the conflicts by taking their changes.
git merge --abort git merge -X theirs other-branch
Your comment may be published.
Name:
Email:
Message: