MyEclipse解决SVN同步冲突问题conflict in the working copy obstructs the current operation

标签：

服务端版本控制软件subversion，客户端是eclipse的插件subclipse。当删除一个东西的时候老是提示错误，说冲突

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

解决办法

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

成功显示：

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解决SVN同步冲突问题conflict in the working copy obstructs the current operation

标签：

原文地址：http://www.cnblogs.com/JsonShare/p/4468027.html