1 Node remains in conflict 树的节点冲突
Tree conflict on ‘xxx.php‘
> local file delete, incoming file edit upon update
Select: (mc) keep affected local moves,
(r) mark resolved (breaks moves), (p) postpone,
(q) quit resolution, (h) help: q
Summary of conflicts:
此问题的意思是 本地删除，更新后传入修改，可以先查看svn status 然后恢复文件即可,
指令: svn revert file 即可
2 svn resolve --accept=working xxx 标记解决冲突，可以解决常见的大多数问题
原文：http://www.cnblogs.com/mengsx/p/7228128.html