SVN：将两个分支合并在一起 [英] SVN: Merging two branches together

问题描述

我们有多个开发人员致力于一个项目。我们采用的是一种分支功能分支方法，在其中执行以下操作：

1. 所有维护工作和错误修复均在trunk


2. 所有新功能都在新分支上完成


3. 分支会定期更新（通过合并从树干到分支的更改）

但是，我们遇到了2个分支[我们将它们分别称为feature-branch-1和feature-branch-2]的情况被合并在一起。做到这一点的最佳方法是什么？我的一部分认为我们应该创建一个新分支。然后，将该分支与第一个特征分支[feature-branch-1]合并。然后与第二个功能分支[feature-branch-2]合并并处理冲突（很可能是项目文件）。

谢谢大家！

解决方案

合并。喜欢它。否则，我不会浪费宝贵的时间，只需复制feature-branch-1并合并feature-branch-2即可。您可能已经做完了，而不是问这个问题：D

We have multiple developers working on a project. We're employing a feature-branch method of branching in which we do the following:

1. All maintenance work and bug fixes are done on the trunk
2. All new functionality is done on a new branch
3. Branch is updated regularly (via merging changes from trunk to branch)

However, we've run into a situation that 2 branches [we'll call them feature-branch-1 and feature-branch-2] need to be merged together. What is the best way to accomplish this? Part of me thinks we should create a new branch. Then, merge that branch with the first feature branch [feature-branch-1]. And then merge with the second feature branch [feature-branch-2] and take care of the conflicts (which will most likely be the project files).

Is there a better way?

Thanks guys!

解决方案

Oooh the merging. Love it.

If you mean you want to combine feature-branch-1, feature-branch-2 and trunk into some new branch then yes - your way is good. Otherwise I wouldn't waste precious time and just copy feature-branch-1 and merge feature-branch-2 into it. You've probably would've done it already instead of asking this question :D

这篇关于SVN：将两个分支合并在一起的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！