问题: svn update 生成Node remains in conflict报错

解决

svn revert --depth=infinity a.txt
 Reverted ‘a.txt’