blocks|key|1655751|text|首先，将您的工作副本切换到主干。然后进行合并范围的修订，从分支到主干。此对话框完成后，差异将是主干工作副本中的挂起更改。您需要提交它们，就像您在工作副本上手动进行更改一样。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|1655752|在我的使用中，更典型的做法是在构建时保持主干运行并分离分支。因此，我唯一需要做的合并就是从主干中获取一个bug修复，并将其放到最新的构建分支上，然后重新发布该分支。对我来说，这是最简单的方法，因为您已经发现合并充其量是笨拙的。就是将最新的分支和主干签出到我的机器上，并从主干复制文件到分支，然后将这两个文件都签入。|1655753|entityMap^0|0|0^^$0|@$1|2|3|4|5|6|7|F|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|G|8|@]|9|@]|A|$]]|$1|D|3|-4|5|6|7|H|8|@]|9|@]|A|$]]]|E|$]]

First switch your working copy to the trunk.
Then do a merge range of revisions, from the branch to trunk.
Once this dialog is complete the differences will be pending changes in your working copy of trunk. You'll need to commit them just as if you manually made the changes on your working copy.

In my usage, its more typical to keep trunk running and spin branches off at the times of builds. So then the only merge I ever need to do is to get a bug fix out of trunk and put it on the latest build branch and re-release that branch. The easiest way for me to do this, since as you have found merging is clumsy at best. Is to keep the latest branch and the trunk checked out to my machine, and to quite literally copy the files from trunk to branch and check both in.

blocks|key|1441125|text|我认为在TortoiseSVN+1.8.5中，Merge+%7C+Merge两个不同的树应该可以工作。当您将分支/标记合并回主干时，诀窍在于From+URL是主干，而to是标记/分支。很奇怪，但这是真的。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|1441126|来源：Merging|offset|length|1441127|对于不在工作副本中但在标记/分支中的目录，您可能会收到冲突错误。只要接受冲突并重做合并即可。|1441128|entityMap|0|LINK|mutability|MUTABLE|url|http://tortoisesvn.net/docs/release/TortoiseSVN_en/tsvn-dug-merge.html^0|0|3|7|0|0|0^^$0|@$1|2|3|4|5|6|7|P|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|Q|8|@]|9|@$D|R|E|S|1|T]]|A|$]]|$1|F|3|G|5|6|7|U|8|@]|9|@]|A|$]]|$1|H|3|-4|5|6|7|V|8|@]|9|@]|A|$]]]|I|$J|$5|K|L|M|A|$N|O]]]]

I think in TortoiseSVN 1.8.5, Merge | Merge two different trees should work. When you merge a branch/tag back to trunk, the trick is that the From URL is the trunk and the To is the tag/branch. Weird but true.

Source: <a href="http://tortoisesvn.net/docs/release/TortoiseSVN_en/tsvn-dug-merge.html" rel="nofollow noreferrer">Merging</a>

For directories that not in your working copy but are in the tag/branch you may get conflict errors. Just accept the conflict and redo the merge.

blocks|key|1655956|text|我使用的是TortoiseSVN+1.9.3，Build+27038。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|1655957|按照以下步骤将分支合并到主干中。|1655958|1)右击主干工作副本，选择下面的选项。|1655959|​|1655960|📷|atomic|offset|length|1655961|1655962|2)如果分支合并到干线中，请选择如下所示的第二个选项，然后单击下一步|1655963|1655964|1655965|1655966|3)在From:字段中输入主干的完整文件夹URL。这听起来可能是错误的，但请记住，主干是您想要添加分支更改的起始点。在To:字段中输入feature分支的完整文件夹URL。|1655967|1655968|1655969|1655970|4)单击next并执行测试合并|1655971|1655972|1655973|1655974|5)如果测试合并成功，则单击合并按钮。|1655975|6)一旦合并成功，然后在主干上提交更改。|1655976|entityMap|0|IMAGE|mutability|IMMUTABLE|imageUrl|https://ask.qcloudimg.com/http-save/yehe-900000/11bf4da4224bc86b2689c3762ef8a1d1.png|imageAlt|1|https://ask.qcloudimg.com/http-save/yehe-900000/e6c2836836a38a9736e80bef1477f479.png|2|https://ask.qcloudimg.com/http-save/yehe-900000/c75239b02fffab7a3d90250335736ec1.png|3|https://ask.qcloudimg.com/http-save/yehe-900000/c8f4b091813615fbeb032e13d45927fa.png^0|0|0|0|0|0|1|0|0|0|0|0|0|1|1|0|0|0|0|0|1|2|0|0|0|0|0|1|3|0|0|0|0^^$0|@$1|2|3|4|5|6|7|1L|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|1M|8|@]|9|@]|A|$]]|$1|D|3|E|5|6|7|1N|8|@]|9|@]|A|$]]|$1|F|3|G|5|6|7|1O|8|@]|9|@]|A|$]]|$1|H|3|I|5|J|7|1P|8|@]|9|@$K|1Q|L|1R|1|1S]]|A|$]]|$1|M|3|G|5|6|7|1T|8|@]|9|@]|A|$]]|$1|N|3|O|5|6|7|1U|8|@]|9|@]|A|$]]|$1|P|3|G|5|6|7|1V|8|@]|9|@]|A|$]]|$1|Q|3|I|5|J|7|1W|8|@]|9|@$K|1X|L|1Y|1|1Z]]|A|$]]|$1|R|3|G|5|6|7|20|8|@]|9|@]|A|$]]|$1|S|3|T|5|6|7|21|8|@]|9|@]|A|$]]|$1|U|3|G|5|6|7|22|8|@]|9|@]|A|$]]|$1|V|3|I|5|J|7|23|8|@]|9|@$K|24|L|25|1|26]]|A|$]]|$1|W|3|G|5|6|7|27|8|@]|9|@]|A|$]]|$1|X|3|Y|5|6|7|28|8|@]|9|@]|A|$]]|$1|Z|3|G|5|6|7|29|8|@]|9|@]|A|$]]|$1|10|3|I|5|J|7|2A|8|@]|9|@$K|2B|L|2C|1|2D]]|A|$]]|$1|11|3|G|5|6|7|2E|8|@]|9|@]|A|$]]|$1|12|3|13|5|6|7|2F|8|@]|9|@]|A|$]]|$1|14|3|15|5|6|7|2G|8|@]|9|@]|A|$]]|$1|16|3|-4|5|6|7|2H|8|@]|9|@]|A|$]]]|17|$18|$5|19|1A|1B|A|$1C|1D|1E|-4]]|1F|$5|19|1A|1B|A|$1C|1G|1E|-4]]|1H|$5|19|1A|1B|A|$1C|1I|1E|-4]]|1J|$5|19|1A|1B|A|$1C|1K|1E|-4]]]]

I am using TortoiseSVN 1.9.3, Build 27038.

Follow below steps in order to merge branch into trunk.

1) Right click on trunk working copy and select the below option.

<a href="https://i.stack.imgur.com/msZUx.png" rel="nofollow noreferrer"><img src="https://i.stack.imgur.com/msZUx.png" alt="enter image description here"></a>

2) In case of Branch Merging into trunk select option second as shown below and click next

<a href="https://i.stack.imgur.com/u4bTY.png" rel="nofollow noreferrer"><img src="https://i.stack.imgur.com/u4bTY.png" alt="enter image description here"></a>

3) In the From: field enter the full folder URL of the trunk. This may sound wrong, but remember that the trunk is the start point to which you want to add the branch changes. 
In the To: field enter the full folder URL of the feature branch.

<a href="https://i.stack.imgur.com/AQMMN.png" rel="nofollow noreferrer"><img src="https://i.stack.imgur.com/AQMMN.png" alt="enter image description here"></a>

4) Click next and do the test merge

<a href="https://i.stack.imgur.com/a9muh.png" rel="nofollow noreferrer"><img src="https://i.stack.imgur.com/a9muh.png" alt="enter image description here"></a>

5) If test merge is successful then click on Merge button.

6) Once merge is successful then commit the changes on trunk.

Using TortoiseSVN, I need to take changes I've done in a branch and then merge them with trunk. 

I am the only developer on this project, so I know trunk hasn't changed. I am learning SVN so that eventually my team can use it.

Basically, I want my trunk to look exactly like the branch.

In pre-svn world, I would just copy the files in my branch folder, delete the files in the trunk folder, and then copy branch into trunk.

In TortoiseSVN, I've tried <code>Reintegrate a branch</code>, <code>Merge a range of revisions</code>, and <code>Merge two different trees</code>. Nothing seems to actually change trunk. I've also tried branching on top of the trunk. This gives me an error, saying that the trunk already exists.

Merge branch with trunk

使用TortoiseSVN，我需要接受我在分支中所做的更改，然后将它们与主干合并。我是这个项目中唯一的开发人员，所以我知道trunk没有改变。我正在学习SVN，以便最终我的团队可以使用它。基本上，我希望我的树干看起来和树枝一模一样。在svn出现之前，我只会复制分支文件夹中的文件，删除主干文件夹中的文件，然后将分支复制到...

问合并分支和主干
EN

社区

活动

资源

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问合并分支和主干EN

社区

活动

资源

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问合并分支和主干
EN