SVN将已经合并的分支合并到主干
[英]SVN merge an already merged branch to trunk
问题描述
Using a command line version of SVN (SlikSvn), I have a branch Ive been working on for a while, and merged it into trunk as I thought I had finished with that branch. 
使用命令行版本的SVN（SlikSvn），我有一个分支已经工作了一段时间，并以我认为已经完成该分支的方式将其合并到主干中。
But now, Ive done more work on the branch, and committed a number of new revisions (to the branch). 但是现在，Ive在分支上做了更多工作，并提交了许多新修订（对分支）。 The trunk has not had any modifications since the branch was merged. 自分支合并以来，主干没有任何修改。
What I want to do now, is get my recent branch changes into trunk, and Im unsure if I should merge from the revision number where this branch started again, or from the revision where I last merged, or the one after... or maybe something else. 我现在想要做的是将最近的分支更改为主干，并且不确定是否应该从该分支再次开始的修订版号，或者我上次合并的修订版或之后的那个版本合并...或也许其他的东西。
Very many thanks. 非常感谢。
2 个解决方案
解决方案1
2 2011-03-22 17:07:46
Did you use merge --reintegrate when merging to trunk? 合并到中继时是否使用了merge --reintegrate ？ That's the right way to do it. 这是正确的方法。 If so, you can continue working in the branch. 如果是这样，您可以继续在分支机构中工作。 But you need to block the merge from being re-merged into your branch. 但是您需要阻止合并重新合并到您的分支中。 See this answer . 看到这个答案 。
解决方案2
1 已采纳 2011-03-22 17:04:32
Just go into trunk working copy do 只是进入行李箱工作副本做
svn merge URL/branchname
that's it. 而已。
Or in TortoiseSVN default merge revision range. 或在TortoiseSVN中默认合并修订范围。
声明:本站的技术帖子网页，遵循CC BY-SA 4.0协议，如果您需要转载，请注明本站网址或者原文地址。任何问题请咨询:yoyou2525@163.com.