对于我只恢复-深度无穷大选项固定 Svn目录存在冲突问题:

svn revert --depth infinity "<directory name>"
svn update "<directory name>"

好吧，下面是如何修复它:

svn remove --force filename
svn resolve --accept=working  filename
svn commit

更多详情见:http://svnbook.red-bean.com/en/1.8/svn.tour.treeconflicts.html

对于我只恢复-深度无穷大选项固定 Svn目录存在冲突问题:

svn revert --depth infinity "<directory name>"
svn update "<directory name>"

给出以下命令:

svn resolved <filename or directory that gives trouble>

(感谢@Jeremy Leipzig在评论中给出的答案)

我想正确的解决方法是:

(1) backup your-file/your-directory
(2) svn revert your-file/your-directory
(3) svn update your-file/your-directory
(4) Merge the backup your-file/your-directory to the updated one.
(5) svn ci -m "My work here is done"

如果您在解决问题时遇到了麻烦(像我一样)，并且由于对资源进行了许多更改而无法删除和更新资源，再加上您使用的是eclipse subversion而不是本机客户端，请遵循以下步骤:

make a copy of your entire project dir perform team>disconnect within eclipse, and choose to delete the svn metadata then choose team>share project, and point to the very same folder that your project resides in choose yes, and commit everything (you may want to exclude some very local resources, like configuration files) if you have deleted or moved some resources prior to your first commit trial, delete those old resources (they should have doubled up, one in old location, one in new) and commit those deletions.

你就完成了。