解决svn update 产生Node remains in conflict的问题
2017-12-09 10:53
627 查看
[root@localhost svnrepos]# svn up .
Updating '.':
Skipped 'pythonresource.txt' -- Node remains in conflict
At revision 14.
Summary of conflicts:
Skipped paths: 1
解决办法是:
[root@localhost svnrepos]svn revert --depth=infinity pythonresource.txt
Reverted 'pythonresource.txt'
[root@localhost svnrepos] svn up .
Reverted 'pythonresource.txt'
再次在本地编辑pythonresource.txt,commit后,到web服务器里,svn up pythonresource.txt ,一切正常。
或者在本地copy pythonresource.txt到其他目录,commit ,然后copy pythonresource.txt 到原来的目录,再次commit 后。在http服务器就不会报错了。
Updating '.':
Skipped 'pythonresource.txt' -- Node remains in conflict
At revision 14.
Summary of conflicts:
Skipped paths: 1
解决办法是:
[root@localhost svnrepos]svn revert --depth=infinity pythonresource.txt
Reverted 'pythonresource.txt'
[root@localhost svnrepos] svn up .
Reverted 'pythonresource.txt'
再次在本地编辑pythonresource.txt,commit后,到web服务器里,svn up pythonresource.txt ,一切正常。
或者在本地copy pythonresource.txt到其他目录,commit ,然后copy pythonresource.txt 到原来的目录,再次commit 后。在http服务器就不会报错了。
相关文章推荐
- svn冲突 -- Skipped 'pc-youpin' -- Node remains in conflict 问题解决
- SVN Skipped 'xxx' -- Node remains in conflict 错误的解决办法
- Java - SVN remains in conflict错误的解决办法
- SVN Skipped 'xxx' -- Node remains in conflict 错误的解决办法
- SVN commit:remains in tree-conflict错误的解决办法
- svn: Aborting commit: '/aaa/bbb/xxxxxxxx' remains in conflict解决方法
- MyEclipse解决SVN同步冲突问题conflict in the working copy obstructs the current operation
- SVN commit:remains in tree-conflict错误的解决办法
- SVN Skipped 'xxx' -- Node remains in conflict 错误的解决办法
- svn使用遇到的commit问题 xxx remains in tree-conflict
- svn-commit遇上aborting commit: remains in conflict 解决办法
- SVN commit:remains in tree-conflict错误的解决办法
- SVN commit:remains in tree-conflict错误的解决办法
- SVN commit:remains in tree-conflict错误的解决办法
- SVN commit:remains in tree-conflict错误的解决办法
- svn 冲突Skipped ‘inm/inm/templates‘ -- Node remains in conflict
- 解决 SVN Skipped 'xxx' -- Node remains in conflict
- rapidsvn "remains in tree conflict"的解决方法
- SVN commit:remains in tree-conflict 错误的解决办法
- SVN commit:remains in tree-conflict错误的解决办法