SVN-将工作副本合并到另一个分支
[英]SVN - Merge working copy into another branch
问题描述
I started doing a bunch of changes in a branch that should have happened in trunk. 
我开始在主干中应该发生的分支中进行大量更改。 I have not committed those changes yet, so my branch has a bunch of uncommitted files. 我尚未提交这些更改，因此我的分支中有一堆未提交的文件。
Trunk shares a same revision as the branch that contains my uncommitted code so it should merge nicely. Trunk与包含我未提交代码的分支共享相同的修订版本，因此它应该很好地合并。
Is there a good way to merge my working copy into trunk instead of the branch? 有没有将我的工作副本合并到主干而不是分支中的好方法？ I do not want to affect the branch at all. 我根本不想影响分支。
Thoughts? 有什么想法吗？
1 个解决方案
解决方案1
1 已采纳 2016-04-29 19:53:40
You can use svn switch to change the path that your working copy points to. 您可以使用svn开关更改工作副本指向的路径。 After svn switch, just commit your changes. svn切换后，只需提交更改即可。
声明:本站的技术帖子网页，遵循CC BY-SA 4.0协议，如果您需要转载，请注明本站网址或者原文地址。任何问题请咨询:yoyou2525@163.com.