解决 SVN Skipped 'xxx' -- Node remains in conflict

svn 提交报错

提交命令：

svn update

提示代码：

Skipped 'test.php' -- Node remains in conflict
At revision 271.
Summary of conflicts:
  Skipped paths: 1

解决方法：

svn remove --force test.php
svn resolve --accept=working  test.php

svn update

提交成功！

Updating '.':
At revision 271.