分支和发布策略
我发现有些人在谈论一些分支策略。所以我想我会得到一些对此的评论。
所以这个项目是从主干分支出来的。称之为分支 A。当工作在分支 A 中进行时。他们从分支 A 分支并称之为分支 B。
他们说，一旦分支 A 功能完成，他们会将其合并回主干，当分支 B 功能完成时，他们会将其合并回主干完成后，它也会合并到主干中。
对我来说听起来不错。这样可以吗？
其他建议是这样的，将分支 A 合并到主干，然后创建一个名为 B 的分支。 我认为这将减少需要完成的合并量。但是，分支 A 中的功能尚未完成。
对于这种情况你怎么看？ 有什么问题吗？ 欢迎任何反馈。这个策略有什么我们可以改进的地方吗？
I found some people talking about a few branching strategies. So I thought I'll get some comments on that.
So the project was branched from trunk. Call it branch A. While the work is going on in branch A. They branched from branch A and called it branch B.
They are saying, once branch A features are done, they will merge it back to trunk and when the branch B features are done, it will also merged to the trunk.
Sounds ok to me. Is this ok?
The other suggestions goes like this, Merge branch A to trunk and then do a branch called B.
Which I think will reduce the amount of merging to be done. But, the features in branch A is not yet complete.
What do you think about this situation?
Anything wrong?
Any feedback is welcome. IS there anything we can improve in this strategy?
如果你对这篇内容有疑问，欢迎到本站社区发帖提问 参与讨论，获取更多帮助，或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱，如果其他用户或者作者回复了您的评论，将不能在第一时间通知您！
发布评论
评论（1）
我认为第一种方法是可以的，但是你必须确保始终使用分支 A 中引入的新更改来更新分支 B。否则，如果你不保持它们同步，这些分支将发散并将它们合并回主干上真的很痛苦。
如果您尽早且经常进行 SVN 合并，那么这是可以的。
I think the first approach is OK, but you have to be sure to always have branch B updated with the new changes introduced in branch A. Otherwise if you don't keep them synchronized, these branches will diverge and merging them back on trunk will be a really pain.
SVN merge's are ok if you do them early and often.