A conflict in the working copy obstructs the CurOP

服务端版本控制软件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

Comments are closed.

时间： 2024-10-13 10:21:24

A conflict in the working copy obstructs the CurOP的相关文章

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 operationsvn: Commit

svn不能更新也不能提交【svn A conflict in the working copy obstructs the current operation】

SVN不能提交解决方法: 最近发现了svn有一种特殊的冲突,跟svn版本库同步的时候,还提示代码没有不一样的,但是文件图标上又是一个特殊的冲突符号,不是那种大红的冲突符号.更新不了也提交不了.就算把代码改了再提交都不行.      解决办法:右击有问题的目录或者文件–>team–>Show Tree Conflict–>在Eclpise中会出现一个Tab视图显示Tree Conflict的内容,一个一个选择列表中的冲突右击将其标志为已解决/Resolved,然后回到项目再提交更改就可以了

<转>svn提示出错异常为remains in conflict

commit -m "" E:/Program Files/MyEclipse 10/Administrator/Workspaces/MyWabacusProject/Person_Spending_Project/src/com/nasoft/jdbc A conflict in the working copy obstructs the current operation svn: Commit failed (details follow): svn: Aborting co

【转】 svn 错误 以及 中文翻译

直接Ctrl+F 搜索你要找的错 # # Simplified Chinese translation for subversion package # This file is distributed under the same license as the subversion package. # # Update to new pot: # msgmerge --update zh_CN.po subversion.pot # # Check translation: # msgfmt

svn解决冲突后还会出现黑*的解决办法

A conflict in the working copy obstructs the current operationorg.tigris.subversion.javahl.ClientException: A conflict in the working copy obstructs the current operationsvn: Commit failed (details follow):svn: Aborting commit: 'D:/eclipse-java-ganym

SVN中文提示

# # Simplified Chinese translation for subversion package # This file is distributed under the same license as the subversion package. # # Update to new pot: #    msgmerge --update zh_CN.po subversion.pot # # Check translation: #    msgfmt --statisti

git conflict

https://wiki.52north.org/bin/view/Documentation/ResolveMergeConflictsInGitEclipse Note that you can also solve directly a merge conflict from Eclipse/Egit itself: See "Egit: Solving Merge Conflicts": You can manually edit the text on the left si

svu update 遇到 Node remains in conflict

http://stackoverflow.com/questions/11774868/svn-checkout-without-restoring up vote4down votefavorite 2 We have some company middleware and sometimes its difficult to find the correct version Im looking for so I often have to update to different versi

Store-exclusive instruction conflict resolution

A data processing system includes a plurality of transaction masters (4, 6, 8, 10) each with an associated local cache memory (12, 14, 16, 18) and coupled to coherent interconnect circuitry (20). Monitoring circuitry (24) within the coherent intercon