当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