SVN - 使用 Cornerstone 2 中主干的更改更新分支
在创建分支后,Cornerstone 2 的 UI 是否有任何方法可以使用主干中所做的更改来更新分支?
Is there any way from Cornerstone 2's UI to update a branch with changes made in the trunk after the branch was created?
如果你对这篇内容有疑问,欢迎到本站社区发帖提问 参与讨论,获取更多帮助,或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱,如果其他用户或者作者回复了您的评论,将不能在第一时间通知您!
发布评论
评论(1)
想通了。在工作副本中,我选择了分支的根目录,然后单击 Cornerstone 顶部工具栏中的“合并”。在合并界面中,选择“同步分支”选项,Cornerstone 执行合并的“试运行”,并显示将从主干合并的所有文件的预览(有一个“合并自”框,默认为主干根目录,^/trunk)。从这里只需单击“合并更改”,分支就会使用所有更改的文件进行更新。
Figured it out. In the working copy, I selected the branch's root directory and clicked 'Merge' from Cornerstone's top toolbar. From the merge interface, the 'Synchronize Branch' option is selected, and Cornerstone performs a "dry run" of the merge and displays a preview of all the files it will merge in from the trunk (there is a 'Merge From' box that defaults to the root trunk directory, ^/trunk). From here just clicked "Merge Changes" and branch was updated with all the changed files.