多个特征分支和连续集成 [英] Multiple feature branches and continuous integration

问题描述

我最近一直在阅读关于持续集成的信息，可能会发生，我不明白如何妥善处理。

I've been doing some reading about continuous integration recently and there is a scenario which could occur which I don't understand how to deal with appropriately.

我们有一个稳定的主线/干线分支，并创建分支的功能。每个开发人员将保持自己的功能分支到最新，通过从主干合并到他们的分支定期。然而，完全有可能在几周或几个月的时间段内创建和工作两个或更多个特征分支。在这个时候，可以部署许多版本的软件。这里我的困惑出现。

We have a stable mainline/trunk branch and create branches for features. Each developer will keep their own feature branches up to date by merging from trunk into their branch on a regular basis. However it is entirely possible that two or more feature branches could be created and worked on over a period of several weeks or months. In this time many releases of the software could be deployed. This where my confusion arises.

一个特征分支的更改很可能会导致与其他特征分支的合并冲突。 CI建议你应该至少每天合并到躯干，这将迅速解决冲突。但是，您可能不希望将功能代码合并到中继，因为它可能未完成，或者您可能不希望该功能在下一个版本中可用。那么，你如何处理这种情况，并仍然遵循日常代码集成的CI原则？

It is very likely that changes for one feature branch will cause merge conflicts with other feature branches. CI suggests you should merge into trunk at least daily which would resolve the conflicts quickly. However, you may not want to merge the feature code into trunk because it may not be finished or you may not want that feature available in the next release. So, how do you deal with this scenario and still follow CI principles of daily code integration?

推荐答案

适当的CI。改用功能切换。

这篇关于多个特征分支和连续集成的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！