为什么从分支创建分支会导致合并中的后续树冲突?
不应该知道mergeinfo是否足以知道不要尝试合并使用trunk保持分支最新的提交?
例如,如果我执行以下操作,则会发生冲突:
trunk
Create branchA from trunk
Create branchB from trunk
Create branchC from trunk
Make changes to branchA
Add jar to branchC
Merge branchC to trunk
Add file to branchB
Update branchB from trunk
Update branchA from trunk
Create Integration from branchA
Merge in branchB
--tree conflict incoming add on existing jar
但是,如果我这样做,我就不会发生冲突:
trunk
Create branchA from trunk
Create branchB from trunk
Create branchC from trunk
Make changes to branchA
Add jar to branchC
Merge branchC to trunk
Add file to branchB
Update branchB from trunk
Update branchA from trunk
Create Integration from trunk
Merge in branchA
Merge in branchB
--no conflict
我可以发布蝙蝠文件,证明这有助于澄清。