进行持续集成时的最佳分支策略? [英] Best branching strategy when doing continuous integration?

问题描述

当您想要进行持续集成时，最好使用的分支策略是什么?

What is the best branching strategy to use when you want to do continuous integration?

1. 发布分支:在主干上开发，为每个发布保留一个分支.
2. 功能分支:在单独的分支中开发每个功能，只有在稳定后才合并.

1. Release Branching: develop on trunk, keep a branch for each release.
2. Feature Branching: develop each feature in a separate branch, only merge once stable.

同时使用这两种策略有意义吗?比如，你为每个版本分支，但你也为大功能分支?这些策略之一是否更适合持续集成?当使用不稳定的主干时，使用持续集成甚至有意义吗?

Does it make sense to use both of these strategies together? As in, you branch for each release but you also branch for large features? Does one of these strategies mesh better with continuous integration? Would using continuous integration even make sense when using an unstable trunk?

推荐答案

我觉得这个话题真的很有趣，因为我的日常工作非常依赖分支机构.

I find the topic really interesting since I heavily rely on branches on my daily job.

• 我记得 Mark Shuttleworth 提出了一个模型，该模型在超越传统 CI 的同时保持主分支的原始状态.我在这里发布了相关信息.
• 因为我熟悉 Cruise Control，所以我还写了关于任务分支和 CI 此处.这是一个分步教程，解释了如何使用 Plastic SCM.
• 最后，我在 Duvall 的关于 CI 也很有趣.

• I remember Mark Shuttleworth proposing a model about keeping the main branch pristine while going beyond conventional CI. I posted about it here.
• Since I'm familiar with Cruise Control, I also blogged about task branches and CI here. It's an step by step tutorial explaning how to do it with Plastic SCM.
• Finally, I found some of the topics about CI (and potentially talking about branching) at Duvall's book on CI very interesting too.

希望你觉得这些链接很有趣.

Hope you find the links interesting.

这篇关于进行持续集成时的最佳分支策略?的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！