分支和合并策略 [英] Branching and Merging Strategies

问题描述

我的任务是制定一个在接下来的6个月中进行分支，合并和发布的策略.

I have been tasked with coming up with a strategy for branching, merging and releasing over the next 6 months.

复杂性来自以下事实:我们将运行多个项目，这些项目的代码更改和发布日期都不同，但是开发开始日期大致相同.

The complication comes from the fact the we will be running multiple projects all with different code changes and different release dates but approximately the same development start dates.

目前，我们正在使用VSS进行代码管理，但是知道它可能会引起一些问题，并且会在开始新开发之前迁移到TFS.

At present we are using VSS for code management, but are aware that it will probably cause some issues and will be migrating to TFS before new development starts.

在制定计划之前，我应该采用什么策略?应该考虑什么?

What strategies should I be employing and what things should I be considering before setting a plan down?

很抱歉，如果不确定，请随时提出问题，如有需要，我会提供更多信息.

Sorry if this is vague, feel free to ask questions and I will update with more information if required.

推荐答案

这是最好的一个.它强调了使行李箱中没有任何垃圾(行李箱中没有垃圾)的重要性.开发应该在开发分支中进行，并且应该将常规合并(在测试了代码之后)放回到主干中(图1)，但是该模型还允许在仍处于开发阶段的情况下对源进行修补(图2).我绝对建议阅读全文，以完全理解.

This is the single best source control pattern that I have come across. It emphasizes the importance of leaving the trunk free of any junk (no junk in the trunk). Development should be done in development branches, and regular merges (after the code has been tested) should be made back into the trunk (Pic 1), but the model also allows for source to be patched while still under development (Pic 2). I definitely recommend reading the post in its entirety, to completely understand.

     Pic 1

     Pic 2

编辑:这些图片如果没有文字，肯定会造成混乱.我可以解释，但是我基本上是在照搬原始作者.话虽如此，我可能应该选择一个更好的图片来描述合并过程，因此希望对您有所帮助.不过，我仍然建议您阅读该帖子:

The pictures are definitely confusing without words. I could explain, but I would basically be copying the original author. Having said that, I probably should have selected a better picture to describe the merge process, so hopefully this helps. I'd still recommend reading the post, however:

这篇关于分支和合并策略的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！