#Skipped 'xx' -- Node remains in conflict 解决办法
svn remove --force filename
svn resolve --accept=working filename
svn up