Blogger Information
Blog 5
fans 0
comment 0
visits 7948
Popular Tutorials
More>
Latest Downloads
More>
Web Effects
Website Source Code
Website Materials
Front End Template
SVN报错Node remains in conflict解决办法
kfzphp项目问题解决方案
Original
3103 people have browsed it

报错显示 Skipped 'index.html' -- Node remains in conflict 说index.hmlt被忽略了,因为冲突
而且index.html又被更新回来了,还是旧版本的内容,之前修改的标题并没有被修改

解决:
经过各种搜索,给出的办法均行不通,后来发现还是stackoverflow比较diao

svn revert --depth=infinity index.html

这里的index.html是冲突的文件,朋友们遇见类似问题只要把这里改成自己svn提示冲突的文件名即可。若此方法行不通,可尝试index.html(也就是冲突文件名)改成该冲突文件所在的文件夹名字


Statement of this Website
The copyright of this blog article belongs to the blogger. Please specify the address when reprinting! If there is any infringement or violation of the law, please contact admin@php.cn Report processing!
All comments Speak rationally on civilized internet, please comply with News Comment Service Agreement
0 comments
Author's latest blog post