在SVN下,有时会出现如下错误:
D C storage/IMountService.java
> local unversioned, incoming add upon update
Summary of conflicts:
Tree conflicts: 1
我们怎样来解决呢?
svn resolve --accept working IMountService.java
svn revert IMountService.java
svn status
用这几条命令就OK啦!