SVN Skipped 'xxx' -- Node remains in conflict 错误的解决办法

今天更新svn是报错

[linux@*****-04 webapps]$ svn up
Updating '.':
Skipped 'christmas' -- Node remains in conflict
At revision 133.
Summary of conflicts:
  Skipped paths: 1

解决方法如下：

[linux@*****-04 webapps]$  svn remove --force christmas
[linux@*****-04 webapps]$  **svn resolve --accept=working christmas
Resolved conflicted state of 'christmas'
[linux@*****-04 webapps]$  svn up
Updating '.':
   C christmas
   U christmas/WEB-INF/view/activity.jsp
   U christmas/WEB-INF/view
   U christmas/WEB-INF
Updated to revision 133.
Summary of conflicts:
  Tree conflicts: 1

问题完美解决！

打脸了，上午修改好的问题又出现了。之前的那个项目找不到了。svn up 又出现冲突。
又找到一种解决方法：

svn revert --depth=infinity christmas