A conflict in the working copy obstructs the Curop

Server version control software subversion, the client is Eclipse plug-in subclipse, personal feeling or CVS is relatively simple and convenient. Obviously there is no conflict, when deleting a thing always prompt error, say conflict

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

Solutions

Right-click the directory you want to delete –>team–>show tree conflict–> in eclpise a tab view displays the contents of the tree Conflict, a conflict in a select list right-click to mark it as resolved, Then return to the project and commit the changes.

Note: The version I'm using Subclipse is http://subclipse.tigris.org/update_1.6.x

Comments is closed.

A conflict in the working copy obstructs the Curop