如果您在解决问题时遇到了麻烦(像我一样)，并且由于对资源进行了许多更改而无法删除和更新资源，再加上您使用的是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.

你就完成了。

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

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

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

给出以下命令:

svn resolved <filename or directory that gives trouble>

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

如果您正在使用Eclipse IDE，并且在提交时偶然发现了这个错误，这里有一个工具内解决方案。我使用Subclipse，但subversion的解决方案可能类似。

您可能没有注意到的是，在冲突文件上有一个额外的符号，它将文件标记为“冲突”。

右键单击文件，选择“Team”和“Edit conflicts…”。选择适当的行动。我之前在文本级别上手动合并了文件，所以我选择了第一个选项，这将把本地副本的当前状态作为“已解决的解决方案”。现在点击“OK”，就这样。

冲突的符号应该已经消失，您应该能够再次提交。

我想正确的解决方法是:

(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"

为了使用命令行消除冲突，我使用以下命令

svn revert "location of conflict folder" -R
svn cleanup
svn update

用于恢复当前目录

svn revert . -R