Git merge: accept theirs for multiple conflicts

问题

I'm trying to merge a git branch (test-development) back into master. There are lots of merge conflicts but I want as many as possible to be resolved via --theirs. Is there a way to tell git to merge with --theirs in bulk?

回答1:

This will do it if you're mid-merge:

git merge test-development
# Automatic merge failed, a bunch of conflicts!
git checkout --theirs ./path
git add ./path
git commit

来源：https://stackoverflow.com/questions/22544305/git-merge-accept-theirs-for-multiple-conflicts