如何让开发人员记住在各处合并他们的错误修复？
我们使用 Subversion 的每个版本一个分支的开发模型。我们倾向于同时拥有 2 或 3 个活动分支 - 主干（开发）和两个发布（维护）分支（即 5.0 和 6.0）。
我们不断遇到的问题是，如果我们在 5.0 中发现错误并在 5.0 中修复它，并不是每个人总是记得将其修复合并到需要合并错误修复的所有分支（在本例中为 6.0 和主干）。
如何确保错误修复已合并到所有必要的分支中？解决这个问题的好方法是什么？
We use the branch-per-release model of development with Subversion. We tend to have 2 or 3 active branches at a time - trunk (development), and two release (maintenance) branches (i.e. 5.0 and 6.0).
The problem we keep running into is that if we find a bug in 5.0 and fix it in 5.0, not everyone always remembers to merge their fixes into all branches into which the bugfix needs to be merged (6.0 and trunk in this case).
How do you make sure bug fixes are merged into all necessary branches? What is a good way of going about this?
如果你对这篇内容有疑问，欢迎到本站社区发帖提问 参与讨论，获取更多帮助，或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱，如果其他用户或者作者回复了您的评论，将不能在第一时间通知您！
发布评论
评论（3）
最好的方法可能就是沟通和教育。召开团队会议 - 确保所有开发人员都达成共识。我们有类似的 SVN 结构，每当我修复错误时，提交后我问自己的第一件事是“还有哪里需要合并？” ——通过交流和重复，它已经深深地印在了我的脑海里。
将合并错误的分支列表放在 wiki 页面或其他公共文档上，以便所有开发人员都可以轻松找到。
The best way is probably just communication and education. Have team meetings - make sure that all of your developers are on the same page. We have a similar SVN structure, and whenever I fix a bug, the first thing I ask myself after committing is, "where else does this need to be merged?" - it's just been hammered into my mind through communication and repetition.
Put the list of branches getting merged bugs on a wiki page or other public document so that it's easily findable by all developers.
你们有专门的测试人员吗？测试人员有责任验证“已修复”是否真正意味着“已在 5.0 和 6.0 开发树中修复”。
Do you have dedicated testers? It should be the testers' responsibility to verify that "fixed" really means "fixed in the 5.0 and 6.0 development trees".
持续集成也可以提供帮助，使用开发和维护树的“通用”测试。
Continuous integration could help as well, using 'common' tests for development and maintenance trees.