1.Node remains in conflict，
修改问价svn 提交后其他客户端svn update更新时出现以下问题
Updating '.':
Skipped 'Hi3559_Stream' -- Node remains in conflict
Skipped 'out_bg0601' -- Node remains in conflict
At revision 641.
Summary of conflicts:
Skipped paths: 2
svn cleanup后依然无效，
解决办法：
svn revert --depth=infinity Hi3559_Stream
svn revert --depth=infinity out_bg0601
最后一个为冲突文件名
轻松解决
3. svn add 且未提交前删除已经增加的
svn revert --recursive addfolder
2. local dir edit, incoming dir delete upon update
Tree conflict on '*****'
> local dir edit, incoming dir delete upon update
Select: (r) mark resolved, (p) postpone, (q) quit resolution, (h) help:
感觉选择哪个都会在下次更新时出问题，
解决办法
svn revert *****(file) -R 轻松解决！