解决subclipse同步冲突问题A conflict in the working copy obstructs the current operation
2014-06-17 14:54
471 查看
转载自海波无痕:解决subclipse同步冲突问题A
conflict in the working copy obstructs the current operation
服务端版本控制软件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-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-->在Eclpise中会出现一个Tab视图显示Tree Conflict的内容,一个一个选择列表中的冲突右击将其标志为已解决,然后回到项目再提交更改就可以了。
注意:我用的版本subclipse是http://subclipse.tigris.org/update_1.6.x
conflict in the working copy obstructs the current operation
服务端版本控制软件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-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-->在Eclpise中会出现一个Tab视图显示Tree Conflict的内容,一个一个选择列表中的冲突右击将其标志为已解决,然后回到项目再提交更改就可以了。
注意:我用的版本subclipse是http://subclipse.tigris.org/update_1.6.x
相关文章推荐
- 解决subclipse同步冲突问题A conflict in the working copy obstructs the current operation
- MyEclipse解决SVN同步冲突问题conflict in the working copy obstructs the current operation
- svn A conflict in the working copy obstructs the current operation
- A conflict in the working copy obstructs the current operation异常
- eclipse SVN A conflict in the working copy obstructs the current operation
- svn A conflict in the working copy obstructs the current operation
- A conflict in the working copy obstructs the current operation
- svn A conflict in the working copy obstructs the current operation
- A conflict in the working copy obstructs the CurOP
- Android-Android studio 出现 Error: NDK integration is deprecated in the current plugin. 问题解决
- Android-Android studio 出现 Error: NDK integration is deprecated in the current plugin. 问题解决
- Android-Android studio 出现 Error: NDK integration is deprecated in the current plugin. 问题解决
- Android-Android studio 出现 Error: NDK integration is deprecated in the current plugin. 问题解决
- You cannot run the non-logged version of bulk copy in this database. Please check with the DBO. 问题的解决方法
- sbt发布assembly解决jar包冲突问题 deduplicate: different file contents found in the following
- You cannot run the non-logged version of bulk copy in this database问题的解决方法
- svn冲突 -- Skipped 'pc-youpin' -- Node remains in conflict 问题解决
- Maven出现错误No plugin found for prefix 'jetty' in the current project and in the plugin groups的问题解决
- 解决SQL Server数据库的"User, group, or role already exists in the current database"问题