Git合并：接受他们的多重冲突

问题描述

我试图将一个git分支（测试开发）合并回主。有很多合并冲突，但我希望尽可能多地通过他们来解决。有没有办法告诉git与他们的批量合并？

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?

推荐答案

这将做到这一点，如果你在中-merge：

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

这篇关于Git合并：接受他们的多重冲突的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持！