服务端版本控制软件subversion，客户端是eclipse的插件subclipse，个人感觉还是cvs比较简单方便。明明没什么冲突，当删除一个东西的时候老是提示错误，说冲突

A conflict in the working copy obstructs the current operation
org.tigris.subversion.javahl.ClientException: A conflict in the working copy obstructs the current operation
svn: Commit failed (details follow):
svn: Aborting commit: ‘D:/eclipse-java-ganymede-SR1-win32/workspace/myProject/database/src’ remains in conflict

org.tigris.subversion.javahl.ClientException: A conflict in the working copy obstructs the current operation
svn: Commit failed (details follow):
svn: Aborting commit: ‘D:/eclipse-java-ganymede-SR1-win32/workspace/myProject/database/src’ remains in conflict

解决办法

右击你要删除的目录–>team–>Show Tree Conflict–>在Eclpise中会出现一个Tab视图显示Tree Conflict的内容，一个一个选择列表中的冲突右击将其标志为已解决，然后回到项目再提交更改就可以了。

注意：我用的版本subclipse是http://subclipse.tigris.org/update_1.6.x