当svn update时提示如下：
D C main.go
> local file unversioned, incoming file add upon update
Summary of conflicts:
Tree conflicts: 1
解决办法：
svn resolve --accept working main.go
svn revert main.go
xiaxiaosheng 2019-02-26 11:39 原文
当svn update时提示如下：
D C main.go
> local file unversioned, incoming file add upon update
Summary of conflicts:
Tree conflicts: 1
解决办法：
svn resolve --accept working main.go
svn revert main.go