svn update 产生Node remains in conflict的问题

输入：sudo svn revert --depth=infinity frontend/web/js/workplace/organization.js

最后在执行 svn  up  就ok了