zoukankan      html  css  js  c++  java
  • 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:UsersAdministratorWorkspacesMyEclipse 8.6AisinoNewWebRoothtmljssale_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

  • 相关阅读:
    A bon chat, bon rat
    获取信息mysql
    Lua笔记3 表达式
    libevent2编译
    opencv环境搭建
    bash console
    Unix Notes.
    ubuntu vsftpd
    axis2客户端代码生成
    IDEA 快捷键
  • 原文地址:https://www.cnblogs.com/JsonShare/p/4468027.html
Copyright © 2011-2022 走看看