trunk ---------------------------renamed dir a/b to a/g ---------------------
/
/
branches/1.0----------------------modified file a/b/Hello.java --
将分支合并到主干。
svn merge ^/myproject/branches/1.0
获取冲突
Tree conflict on 'ab'
> local missing or deleted or moved away, incoming dir edit upon merge
Select: (r) mark resolved, (p) postpone, (q) quit resolution, (h) help: r
如果我选择"标记已解决",则忽略(未合并(下修改的文件 Hello.java。我应该怎么做才能在冲突树下提取更改的文件(例如 Hello.java(?如何合并这个塞纳里奥?
SVN, 版本 1.9.1 (r1698128(
在这种情况下
,您必须直接在文件夹级别合并
cd trunk_working_copy
svn merge ^/myproject/branches/1.0/a/b ./a/g