如果我不从 Subversion 中的主干合并，是否需要重新集成？
我读过很多关于在 SVN 中从分支合并回主干时需要重新集成的内容（一篇关于外部存储库合并的文章非常有帮助）。
问题似乎来自这样一个事实：人们定期从主干更新分支，这意味着最终的合并回来是反射性的。
在我的用例中，我们想要创建一个发布分支，只要稳定分支并修复任何错误，该分支就会一直存在。为了保持稳定性，我们不想从主干向上合并，但我们确实希望定期从发布分支向下合并修复，以便主干免费获得所有错误修复。我们也不想等到 QA 结束才合并回主干。因此，我们想要：
- 创建分支
- 对分支（和主干）进行定期更改
- 定期合并回主干（也许每天）
因为我们永远不会从主干合并，所以我认为我们不需要担心以下问题：重新集成旨在修复。这种做法有问题吗？
I have read quite a bit about the need to re-integrate when you merge from a branch back to the trunk in SVN (an article about foreign repository merges was really helpful).
The problem seems to come from the fact that people are regularly updating the branch from the trunk which means that the final merge back is reflective.
In my use-case, we want to create a release branch which will live for as long as it takes to stabilise the branch and fix any bugs. To maintain stability we don't want to merge up from the trunk, but we do want to regularly merge fixes down from the release branch so that the trunk gets all the bug fixes for free. We also don't want to wait until the end of QA to merge back to trunk. We therefore want to:
- Create the branch
- Make regular changes to the branch (and trunk)
- Merge back to trunk regularly (daily perhaps)
Since we will never merge up from trunk, I don't think that we need to worry about the problems that re-intergrating is designed to fix. Is there a problem with this approach?
如果你对这篇内容有疑问，欢迎到本站社区发帖提问 参与讨论，获取更多帮助，或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱，如果其他用户或者作者回复了您的评论，将不能在第一时间通知您！
发布评论
评论（1）
您的方法非常适合您的情况。
反射合并的唯一问题是失去冲突解决工作（以及合并期间提交的不相关更改）。
由于您不会有任何冲突的更改，并且分支上的所有更改集都将是合并到主干中的合法候选者，因此您可以开始了。
如果您从主干开始合并，那么您可能会遇到一些麻烦，但即使如此，如果您进行了最少的冲突解决工作并且跟踪它，那么您仍然可以继续。
Your approach will work fine for your case.
The only problem with reflective merges is loosing the conflict resolution work (and unrelated changes committed during a merge).
Since you won't have any conflicting changes, and all changesets on your branch will be legitimate candidates for merging into trunk, you're good to go.
If you start merging from trunk, then you might be in some trouble, but even then, if you've got minimal conflict resolution work and you keep track of it, you're still good to go.