重新整合一个分支与合并一系列修订 [英] Reintegrate a branch vs merge a range of revision

问题描述

在 subversion 中，我创建了一个分支，现在我想将它合并回主干.我应该使用哪个选项?

In subversion I made a branch now I want to merge it back into trunk. Which option should I use?

重新整合一个分支

或

合并一系列修订

我正在使用 Merge 一系列修订版，但我遇到了各种树冲突错误.知道这两者有什么区别吗?

I was using Merge a range of revisions, but I was getting all sorts of tree conflict errors. Any idea what the difference is between these two?

推荐答案

在使用分支时，您应该定期将修订范围从主干合并到分支到 保持分支同步.如果您没有将任何版本号传递给 svn merge，并且您的 svn 服务器版本是 1.5 或更高版本，它将跟踪您之前完成的合并并自动仅合并较新的修订版.

When working with a branch, you should periodically merge ranges of revisions from the trunk into the branch to keep the branch in sync. if you don't pass any version numbers to svn merge and your svn server version is 1.5 or newer, it will track the merges you've previously done and automatically merge only newer revisions.

当分支完成时，您应该最后一次合并更改，然后重新整合回到主干.

When the branch is finished, you should merge changes into it one last time, then reintegrate it back into the trunk.

这篇关于重新整合一个分支与合并一系列修订的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！