SVN分支的一个分支
我们的代码存储库包括: * 树干, * 分支 A - 从主干开始, * 分支 B - 从分支 A 开始,
在分支 A 上工作的程序员希望将其重新集成到主干中,并仅继续在主干上工作。
我们还不想将分支 B 重新集成到分支 A 中。
是否可以让分支 B 与主干相关,而不是与分支 A 相关,以便两个程序员可以继续分别在主干和分支 B 上工作?
(我希望我的问题很清楚)
Our code repository includes:
* trunk,
* branch A - starts from trunk,
* branch B - starts from branch A,
The programer that works on branch A wants to reintegrate it into the trunk, and continue working on the trunk only.
We do not want to reintegrate branch B into branch A yet.
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)
如果你对这篇内容有疑问,欢迎到本站社区发帖提问 参与讨论,获取更多帮助,或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱,如果其他用户或者作者回复了您的评论,将不能在第一时间通知您!
发布评论
评论(2)
据我所知,您有以下情况:
您将从 A 到主干:
如您所见,B 从 A 开始并且有其内容。无法将其更改为从另一个代码库启动,因为它已经存在。您所能做的就是在将A 的更改合并到trunk 后,将trunk 的更改合并到B。在这种情况下,分支B将具有主干和分支A的实际内容:
As I see it, you have following situation:
And you are going to do merge from A to trunk:
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:
主干和所有分支都只是一些文件夹,其中包含一些文件。你可以将任何东西与其他东西合并。所以,答案是,不存在确切的“关系”概念,但实际上并不需要这个概念。
Both trunk and all the branches are just some folders with some files in them. You are allowed to merge anything with anything else. So, the answer is that there's no exact concept of "relation", but one is not actually needed.