svn 提交报错
提交命令：
svn update
提示代码：
Skipped ‘static/face_picture‘ -- Node remains in conflict At revision 271. Summary of conflicts: Skipped paths: 1
解决方法：
sudo svn remove --force static/face_picture
sudo svn resolve --accept=working static/face_picture
sudo svn update
提交成功！
Updating ‘.‘: At revision 1767.
原文：http://www.cnblogs.com/bing-yu12/p/6442133.html