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

更新命令：

svn up

提示代碼：意思就是說 ，這個文件衝突了，你要解決下

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

解決方法：

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

測試下命令：

svn up

Updating '.':
At revision 2460.

看到這裏  成功解決