Server version control software subversion, the client is the Eclipse plugin subclipse. When deleting a thing always prompt error, say conflict
Commit-m "" C:/users/administrator/workspaces/myeclipse 8.6/aisinonew/webroot/htmljs/sale_protocol.js
A conflict in the working copy obstructs the current operation
Svn:commit failed (details follow):
Svn:aborting commit: ' C:\Users\Administrator\Workspaces\MyEclipse 8.6\aisinonew\webroot\htmljs\sale_protocol.js ' 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.
Successful display:
Resolve--accept=working C:/users/administrator/workspaces/myeclipse 8.6/aisinonew/webroot/htmljs/sale_ Protocol.js
Resolved conflicted state of C:/users/administrator/workspaces/myeclipse 8.6/aisinonew/webroot/htmljs/sale_ Protocol.js
MyEclipse Resolving SVN sync conflict Conflict in the working copy obstructs the current operation