TFS 2010 修补程序分支/合并策略没有无根据的合并？
我试图了解如何在 Team Foundation Server 2010 中使用分支和合并。以下策略适用于 Web 开发团队。
我的想法是有 5 个文件夹。 Main 文件夹、Development 文件夹、QA 文件夹、Production 文件夹和 Hotfix 文件夹。主文件夹将仅包含主分支。开发人员可以直接在主分支中工作，也可以在开发文件夹中创建一个新分支，然后在完成后合并回主分支。当我们想要创建发布版本时，我们将主分支升级为 QA 1.0.0 分支。当该分支稳定后，我们将该分支提升为生产分支 1.0.0。 Production 分支变为只读，然后 QA 分支将合并回主分支。我们还使用 QA 1.0.0 分支来进行分支修补程序。所以这里的例子是，在 QA 分支进入生产后，我们发现了一些错误。然后我们将 QA 分支 1.0.0 升级为 Hotfix 1.0.1 分支。当 Hotfix 分支稳定后，我们将其升级为 Production 分支 1.0.1。当在 Production 1.0.1 分支中发现新错误时，我们会从 Hotfix 1.0.1 分支创建一个新的 Hotfix 1.0.2 分支。当该分支稳定后，我们将该分支升级到 Production Branch 1.0.2。所有这些在 Team Foundation Server 2010 中都运行良好。
我所遇到的但不知道如何在 TFS 2010 中以良好的方式解决的问题是如何将修补程序升级到主分支。我不想将我的修补程序合并到 QA 1.0.0 分支中，因为我可能需要为 QA 分支 1.0.0 中的不同客户创建不同的修补程序。所以我需要将 Hotfix 1.0.1 分支直接合并到主分支中。
我知道我可以使用命令行工具通过无根据的合并来解决它。这是唯一的出路吗？还有其他更好的建议如何解决我想要完成的任务吗？用户界面工具？如果我想使用的分支/合并策略可以得到改进，我也将不胜感激。
I am trying to understand how to work with branching and merging in Team Foundation Server 2010. The strategy below is for a web development team.
My idea is to have 5 folders. The Main folder, a Development folder, a QA folder, Production folder and a Hotfix folder. The Main folder will only consist of the Main Branch. The developer will either work directly in the Main Branch or create a new branch in the Development folder and then merge back into the Main Branch when done. When we want to create a release version we promote the Main Branch to a QA 1.0.0 Branch. When that branch is stable we promote that branch to a Production Branch 1.0.0. The Production Branch becomes read only, and the QA branch then will be merge back to the Main Branch. We also use the QA 1.0.0 Branch to for example branching Hotfixes. So the example here is that after the QA Branch goes to Production we find some bugs. We then promote the QA Branch 1.0.0 to Hotfix 1.0.1 Branch. When the Hotfix Branch is stable we promote it to a Production Branch 1.0.1. When a new bug is found in the Production 1.0.1 Branch we create a new Hotfix 1.0.2 Branch from Hotfix 1.0.1 Branch. When that branch is stable we promote that branch to Production Branch 1.0.2. All this works well in Team Foundation Server 2010.
The problem I have and don't know how to solve in a good way in TFS 2010 is how to promote the Hotfix to the Main Branch. I don't want to merge my Hotfix into the QA 1.0.0 Branch since I might need to create a different Hotfix for a different customer from the QA Branch 1.0.0. So I need to merge the Hotfix 1.0.1 Branch directly into the Main Branch.
I understand that I can solve it with a baseless merge using the command line tool. Is this the only way to go? Are there any other better suggestions how to solve what I want to accomplish,? UI tools? I would also appreciate any input if the branching/merging strategy I want to use somehow could be improved.
如果你对这篇内容有疑问，欢迎到本站社区发帖提问 参与讨论，获取更多帮助，或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱，如果其他用户或者作者回复了您的评论，将不能在第一时间通知您！
发布评论
评论（1）
我理解为什么你不想通过 QA 分支合并回来，但我认为这是因为假设你必须从最新版本分支。如果您需要创建第二个修补程序，您始终可以从 QA 1.0.0.0 的原始版本分支，而不是使用旧版本代码的最新版本。你并不总是需要从尖端分支。
I understand why don't you want to merge back through the QA branch, but I think that comes from assuming you have to branch from the latest revision. If you need to create a second hot fix you can always branch from the original version of QA 1.0.0.0, not the latest version using an older version of the code. You don't always have to branch from the tip.