SVN 更新报错

2020-11-30

字数统计: 52 | 阅读时长≈ 1 分钟

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

解决方法：

1	svn revert --depth=infinity template

svn remove --force filename
svn resolve --accept=working  filename

svn update

修改svn地址

1 2	svn info svn sw --relocate http://xxxxx/program/ http://wwwww/program/