git - 确定 Octopus merge 期间哪些分支发生冲突

Question

我们正在尝试建立一个使用 git octopus merges 的过程来 merge 许多主题分支以进行定期发布。当有冲突时，它似乎并没有输出哪些分支发生了冲突。有谁知道在 Octopus merge 后确定冲突来自哪些分支的方法？

Answer 1

git merge man page 提及:

octopus

This resolves cases with more than two heads, but refuses to do a complex merge that needs manual resolution. It is primarily meant to be used for bundling topic branch heads together. This is the default merge strategy when pulling or merging more than one branch.

和this thread确实说明了这一点:

The octopus strategy cannot do merges which need manual resolution. Or so the doc says. After trying the merge with 4 2 5, Git tells you:

Trying simple merge with 7ff9b5bd514cb600bac935ebd40eae366bba7d19
Trying simple merge with 6872cd350154743d59cb4d313cbdb122ac43e537
Simple merge did not work, trying automatic merge.
Auto-merging file.txt
ERROR: content conflict in file.txt
fatal: merge program failed
Automated merge did not work.
Should not be doing an Octopus.
Merge with strategy octopus failed.

That is, it aborts the merge completely. If you "resolve" it and commit it's simply a commit that you make.