svn提交报错Skipped 'xxx' At revision

svn提交报错

Skipped 'Action.class.php'
At revision 1846.
Summary of conflicts:
  Skipped paths: 1

使用svn status查看后：

local missing or deleted or moved away, incoming file delete or move upon merge

解决方式

svn resolved 文件名//解决冲突

成功后提示

Resolved conflicted state of 'xxx'