我使用可视SVN作为我的服务器并将svn作为我的客户端进行操作以进行所有分支，合并等。结构类似于主干和分支的下方
ROOT
/trunk
|
---/trunk files
/branches
|
----/my_branch
|
----/branch_files
|
----/other_branch
|
----/branch_files
当我尝试使用修订范围进行my_branch与other_branch的合并时，我得到以下错误，The last merge operation tried to replace the directory ", but the directory was already edited.然后我对冲突的选项是："Accept current working copy state (mark as resolved)"; :Postpone all remaining conflicts"; "Resolve later"; "abort merge"并且无论哪个都是选项我选择合并永远不会完成。我怎么能解决这个冲突？