分支的SVN分支

问题描述：

我们的代码存储库包括：
*中继线，
*分支A-从中继线开始，
*分支B-从分支线A开始，

Our code repository includes: * trunk, * branch A - starts from trunk, * branch B - starts from branch A,

在分支A上工作的程序员希望将其重新集成到主干中，并仅继续在主干上工作。

The programer that works on branch A wants to reintegrate it into the trunk, and continue working on the trunk only.

我们不想重新集成分支B进入分支A了。

We do not want to reintegrate branch B into branch A yet.

是否有可能使分支B与主干有关，而不是与分支A有关，以便两个程序员可以继续分别工作树干和分支B上？

Is it possible to have branch B relate to the trunk, instead of to branch A, so that the two programmers can continue to work separately on trunk and on branch B?

（我希望我的问题很清楚）

(I hope my question is clear)

答

我看到的是以下情况：

您将要从 A 合并到 trunk ：

如您所见， B 已从 A 及其内容。因为它已经存在，所以不能将其更改为从另一个代码库开始。您所要做的就是将 A 到 trunk 的更改从 trunk 合并到 B 。在这种情况下，分支 B 将具有 trunk 和分支 A 的实际内容：

As you see, B has started from A and has its content. It cannot be changed to start from another codebase because it already exists. All you can do is merge changes from trunk to B after you have merged changes from A to trunk. In this case branch B will have actual content of both trunk and branch A:

分支的SVN分支

相关推荐