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

更新命令：

svn up

提示代码：意思就是说 ，这个文件冲突了，你要解决下

Updating '.':
Skipped 'sitefront/config/jk/j.php' -- Node remains in conflict
A    sitemanage/config/jk/h.php
Updated to revision 2457.
Summary of conflicts:
  Skipped paths: 1

解决方法：

svn remove --force sitefront/config/jk/j.php
svn resolve  --accept=working sitefront/config/jk/j.php

测试下命令：

svn up

Updating '.':
At revision 2460.

看到这里 成功解决