源代码控制流程 - 缺少修复
我使用 Subversion 和 Subclipse 进行源代码管理，并遵循主干和版本分支的流程。
这运作良好，合并时没有大问题。 但是，当主干和分支中的文件发生重大更改时（不幸的是，这是必要的），我必须手动编辑冲突。 问题是我发现我偶尔会错过一两个错误修复。
其他人如何处理这种情况？ 除了更加关注或雇用视力更好的人之外； 还有其他可能的解决方案吗？
我将 JIRA 引用添加到任何提交中，但是这些引用随后会在合并中丢失。
谢谢。
I am using Subversion and Subclipse for my source control and follow the process of having a main trunk and taking branches for versions.
This works well and there are no major problems merging. However when there are significant changes to a file both in the trunk and the branch (unfortunately necessary) I have to manually edit the conflicts. The problem is that I am finding that I occasionally miss a bugfix or two.
How do others handle this situation? Aside from paying more attention or employing someone with better eyesight; are there any other possible solutions?
I add my JIRA references to any commits, however these then get lost in the merge.
Thanks.
如果你对这篇内容有疑问，欢迎到本站社区发帖提问 参与讨论，获取更多帮助，或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱，如果其他用户或者作者回复了您的评论，将不能在第一时间通知您！
发布评论
评论（3）
对主干进行所有更改，然后选择哪些修订进入哪个版本分支...
这为您提供了修订版本的直观记录（合并信息）。
还假设所有修订最终都将包含在主干的发行版中。
Make ALL changes to trunk and then cherry pick which revisions go to which version branch ...
This gives you a visual record of what revisions have gone where (merginfo).
Also assumes that all revisions will be eventually be included in a release from trunk.
自动化单元测试和 持续集成 ...
Automated Unit testing & Continuous Integration ...
如果问题是您不记得从某一天到另一天合并了哪些错误修复，我建议使用 tortoisesvn 进行“仅记录合并” - 这正是您必须执行的情况手动的事情现在想记录下来。
If the problem is that you can't remember which bugfixes have been merged across from one day to the other, I'd suggest doing a "record merge only" using tortoisesvn - this is for exactly the situation where you've had to do things manually and now want to make a record of the fact.