SVN将分支合并到另一个分支和主干
[英]SVN Merging a branch to another branch and the trunk
问题描述
Some background: I have a project trunk and two branches. 
一些背景：我有一个项目主干和两个分支。 Branch A has changes to it and is waiting for others to review it before I can merge it back to the trunk. 分支A对其进行了更改，正在等待其他人对其进行复审，然后才能将其合并回主干。 In the meantime I'm working on refactoring and cleaning up all of the code in general with Branch B. I want the changes from Branch A on Branch B so I don't refactor anything that was changed in the Branch A and have weird conflicts. 同时，我正在与分支B一起重构和清理所有代码。我希望对分支B上的分支A进行更改，所以我不重构在分支A中发生的任何更改并且有奇怪的冲突。 I plan on merging Branch A back to the trunk in the meantime. 同时，我计划将分支A合并回主干。
My Question: If I merge Branch A to Branch B, then I merge Branch A to the trunk, will it cause problems with Branch B when I merge from the trunk to Branch B? 我的问题：如果将分支A合并到分支B，然后将分支A合并到主干，从主干合并到分支B时，分支B是否会引起问题？ It seems like it would because both the trunk and Branch B at that point will have code that is the same, but was pulled in from Branch A. Is svn able to handle such a case without it causing conflicts since both Branch B and the trunk were modified independently of one another? 这似乎是因为主干和分支B那时都将具有相同的代码，但是是从分支A提取的。SVN能够处理这种情况而不会引起冲突，因为分支B和主干都彼此独立地进行了修改？
1 个解决方案
解决方案1
0 2017-11-17 07:46:18
With "cyclic merge" weird (and almost not predictable) results are still very expectable (at least for SVN 1.9.*) 对于“循环合并”，怪异的（几乎是不可预测的）结果仍然非常可预期（至少对于SVN 1.9。*）
Another additional weighty argument in favor of migration to the Mercurial (where Merge-Hell is just unknown reality) 另一个重要的论点是支持迁移到水星（在这里，合并-地狱只是未知的现实）
声明:本站的技术帖子网页，遵循CC BY-SA 4.0协议，如果您需要转载，请注明本站网址或者原文地址。任何问题请咨询:yoyou2525@163.com.