Subversion:如何合并特定的提交 [英] Subversion: How to merge a specific commit

问题描述

我在分支上有一些承诺.我想将分支合并到主干，但是有些提交不合并到分支上的主干.我该怎么办?

I have some commit on my branches. I want to merge the branches to trunk, but there have some commit that I don't merge to trunk on my branches. How do I do?

推荐答案

要完成的功能通常在版本控制系统中称为 cherrypicking .

What you want to accomplish is usually called cherrypicking in version control systems.

假设您要将分支机构的版本345、364和377合并到主干，则将在trunk的干净工作副本的顶级目录中执行以下操作:

Say that you want to merge revisions 345, 364 and 377 from your branch to trunk, you will do the following at the top level directory of a clean working copy of trunk:

svn merge -c345,364,377 ^/_your_branch_

您可以在相应的

You can find more information in the corresponding section of the SVN Book.

这篇关于Subversion:如何合并特定的提交的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！