svn报错：‘local unversioned, incoming add upon update问题’的解决

转自：https://www.cnblogs.com/chunshu/p/6392562.html

 

当update的时候遇到如下问题
svn status

　　D C ~/workspace/test/a.c

　　　　> local unversioned, incoming add upon update

　　Summary of conflicts:

　　Tree conflicts:1

 

 

① svn resolve --accept working ~/workspace/test/a.c
　　Resolved conflicted state of '~/workspace/test/a.c'
②svn revert ~/workspace/test/a.c
　　Reverted'~/workspace/test/a.c'
svn status

 

 

类似

svn revert part7/'~$哈哈哈、嘻嘻摸底表 - 汪健 -.xlsx'