常见错误一：<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<

1.Skipped \’chatbot_api/views/冲突错误文件.py\’ — Node remains in conflict  错误如下所示

root@kj-chatbot:/data/project/xxx/xxyyxx# svn up
Updating \'.\':
Skipped \'chatbot_api/views/冲突错误文件.py\' -- Node remains in conflict

2.解决方案执行以下命令：

svn remove –force chatbot_api/冲突报错文件.py    

svn resolve –accept=working chatbot_api/views/冲突报错文件.py

3.然后在svn up 就可以成功

 

常见错误二：<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<

1.local file delete, incoming file edit upon update  错误如下所示：

 

root@kj-chatbot:/data/project/xxx/xxyyxx# svn up
Updating \'.\':
   C chatbot_api/views/冲突报错文件.py
At revision 10219.
Tree conflict on \'chatbot_api/views/冲突报错文件.py\'
   > local file delete, incoming file edit upon update
Select: (mc) keep affected local moves,
        (r) mark resolved (breaks moves), (p) postpone,
        (q) quit resolution, (h) help: q
Summary of conflicts:
  Tree conflicts: 1

2.解决方案执行以下命令：

 svn revert chatbot_api/views/冲突报错文件.py -R

3.然后在svn up 就可以成功

版权声明：本文为DJRemix原创文章，遵循 CC 4.0 BY-SA 版权协议，转载请附上原文出处链接和本声明。
本文链接：https://www.cnblogs.com/DJRemix/p/13050890.html