SVN重命名分支中的文件夹,冲突
我有一个分支,其中的文件夹被重命名。现在我试图将主干的更改合并到这个分支,但是主干中修改的文件仍在原始文件夹名称下,因此 svn 引发树冲突。我该如何解决这个问题?
使用 svn rename 重命名该文件夹。
I have a branch in which a folder was renamed. Now i'm trying to merge changes from trunk to this branch, but the files modified in the trunk are still under the original folder name, so svn throws a tree conflict. How can i resolve this?
The folder was renamed using svn rename.
如果你对这篇内容有疑问,欢迎到本站社区发帖提问 参与讨论,获取更多帮助,或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱,如果其他用户或者作者回复了您的评论,将不能在第一时间通知您!
发布评论
评论(1)
在这种情况下,合并总是会产生完整合并的树冲突。避免这种冲突并合并代码的快捷方式是,将整个主干合并到该分支后...忽略树冲突,合并各个文件夹。
例如:
/trunk
与/branches/Branch1
合并/trunk/FolderC
与/branches/Branch1/Renamed Folder
>干杯!!
This is a case where the merge will always give a tree conflict for the complete merge. A shortcut to avoid this conflict and merge the code is that, after merging the complete trunk to this branch ... ignoring the tree conflict, merge the individual folder(s).
Eg:
/trunk
with/branches/Branch1
/trunk/FolderC
with/branches/Branch1/Renamed Folder
Cheers!!