SVN Skipped 'xxx' -- Node remains in conflict 錯誤的解決辦法
阿新 • • 發佈:2018-12-15
今天更新svn是報錯
[[email protected]*****-04 webapps]$ svn up
Updating '.':
Skipped 'christmas' -- Node remains in conflict
At revision 133.
Summary of conflicts:
Skipped paths: 1
解決方法如下:
[[email protected]*****-04 webapps]$ svn remove --force christmas
[[email protected]*****-04 webapps]$ **svn resolve --accept=working christmas
Resolved conflicted state of 'christmas'
[ [email protected]*****-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