svn 解决冲突

当svn update时提示以下：

D C main.go
> local file unversioned, incoming file add upon update
Summary of conflicts:
Tree conflicts: 1svn

解决办法：io

svn resolve --accept working main.godate

svn revert main.gofile