Subversion - 嵌套分支
我从主干创建了一个分支Feature1。然后我从Feature1创建了一个分支Feature1.1。 像这样：
+--------- Feature1.1
/
+-----+----------- Feature1
/
/----------+--------------------------------------------- trunk
我现在已经完成了对Feature1的工作，但我还必须对Feature1.1进行更多编码，因此我将Feature1与trunk合并，如下所示：
- Merged: Trunk ->功能 1
- 已合并：功能 1 -> Feature1.1
- 合并：Feature1 -> Trunk（重新集成）
我的计划是合并“Trunk -> Feature1.1”并继续在Feature1.1中工作并修复Trunk中的Feature1错误。但是当我尝试合并“Trunk -> Feature1.1”时，看起来项目中的所有文件都被标记为冲突。
我是否必须手动合并文件（~100 个文件...）或者有人知道如何解决这个问题？
一种解决方案可能是将Feature1.1 中的文件合并到Feature1（如果可能的话），然后从Feature1 分支执行另一个主干重新集成合并。请参阅保持重新集成的分支处于活动状态 在 SVN 书中。
I have created a branch Feature1 from trunk. Then I created a branch Feature1.1 from Feature1.
Like this:
+--------- Feature1.1
/
+-----+----------- Feature1
/
/----------+--------------------------------------------- trunk
I have now finished my work on Feature1, but I have to do some more coding on Feature1.1, so I have merged Feature1 with trunk like this:
- Merged: Trunk -> Feature1
- Merged: Feature1 -> Feature1.1
- Merged: Feature1 -> Trunk (with reintegrate)
My plan was then to merge "Trunk -> Feature1.1" and continue working in Feature1.1 and bug fixing Feature1 in the trunk. But when I try to merge "Trunk -> Feature1.1" it looks like all the files in the project are marked with conflicts.
Will I have to manually merge the files (~100 files...) or does anyone know how to solve this?
One solution could be to merge the files in Feature1.1 to Feature1 (if even that's possible) and then do another trunk-reintegrate-merge from the Feature1 branch. See chapter Keeping a Reintegrated Branch Alive in the SVN book.
如果你对这篇内容有疑问，欢迎到本站社区发帖提问 参与讨论，获取更多帮助，或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱，如果其他用户或者作者回复了您的评论，将不能在第一时间通知您！
发布评论
评论（1）
我认为它应该开箱即用。如果看起来，它对您的设置不起作用，并且因为您知道在主干上完成的每项更改，直到版本达到场景的第 3 步（我们将称为 TheRev ），您可以将所有修订从主干合并到Feature1.1，直到TheRev与
--record-only< /code>标志。它只会将这些修订标记为合并到 Feature1.1 中。您应该能够像平常一样工作。
I think it should work out of the box. If, as it seems, it doesn't work on your setup, and since you know that every change done on the trunk until the revision reached at step 3 of your scenario (that we'll call TheRev), you may merge all the revisions from trunk to Feature1.1 until TheRev with the
--record-onlyflag. It will just mark those revisions as merged in Feature1.1.You should the be able to work as usual.