svn 解决冲突

当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