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