1
trunk ---------------------------renamed dir a/b to a/g ---------------------
\ /
\ /
branches/1.0----------------------modified file a/b/Hello.java --
將分支合併到中繼文件。svn merge:重新命名文件夾下的源文件未合併
svn merge ^/myproject/branches/1.0
獲取衝突
Tree conflict on 'a\b'
> local missing or deleted or moved away, incoming dir edit upon merge
Select: (r) mark resolved, (p) postpone, (q) quit resolution, (h) help: r
如果我選擇 「標記爲已解決」,在A/B修改後的文件Hello.java被忽略(未合併)。我應該怎麼做才能在衝突樹下拉取已更改的文件(例如Hello.java)?如何在這個senario中合併?
SVN版本1.9.1(r1698128)