svn更新时提示Node remains in conflict

[yeqiu]

svn revert --depth=infinity [冲突目录或文件]