[转]subclipse同步冲突问题A conflict in the working copy obstructs the current operation

服务端版本控制软件subversion,客户端是eclipse的插件subclipse

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-win32workspacemyProjectdatabasesrc' 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-win32workspacemyProjectdatabasesrc' remains in conflict

解决办法

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

myEclipse 同上

原文: http://blog.ziki.cn/221.html

你可能感兴趣的:(SVN,同步冲突)