SVN - 分支标签回到根
我有一个 svn 存储库。我现在已经为此存储库创建了一个分支来完成一些主要的开发工作。现在,我可以在项目中创建的一些功能可以直接提交到主存储库而不是分支。有没有办法提交这些更改,而无需我再次切换分支?
更新:
我正在使用TortoiseSVN,并希望用它来将分支重新集成回根。
I have a svn repository. I have now created a branch for this repository to do some major dev work. Now some of the features that I can created in my project can be committed directly to the main repository instead of the branch. Is there a way to do commit those changes without having me to switch the branch again?
Update:
I am using TortoiseSVN and was hoping to use that to re-integrate the branch back into the root.
如果你对这篇内容有疑问,欢迎到本站社区发帖提问 参与讨论,获取更多帮助,或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱,如果其他用户或者作者回复了您的评论,将不能在第一时间通知您!
发布评论
评论(3)
您需要将分支与主干(根)重新集成。
检查重新集成分支部分的此链接 Tortoise SVN 在线帮助。
You needs to re-integrate the branch with the trunk (root).
Check on this link on section Reintegrate a branch of the Tortoise SVN online help.
您必须切换回主干,或签出新的工作副本。您可以根据不同的 URL/分支拥有 2 个或更多工作副本。
然后,如果您想关闭分支(对于功能完成后的功能分支很有用),请使用重新集成合并,或者如果您想继续在分支上进行开发,请使用正常合并。
请参阅与 TortoiseSvn 合并
You'll have to switch back to trunk, or checkout a new working copy. You can have 2 or more working copies based on different URLs/branches.
Then use reintegrate merge if you want to close the branch (useful for a feature branch when the feature is done), or normal merge if you want to continue development on the branch.
See merging with TortoiseSvn
听起来也许
svn merge --reintegrate
就是您正在寻找的?http://svnbook.red-bean.com/en/ 1.5/svn.branchmerge.basicmerging.html
Sounds like maybe
svn merge --reintegrate
is what you're looking for?http://svnbook.red-bean.com/en/1.5/svn.branchmerge.basicmerging.html