遇到冲突的文件
svn resolved ./model/Lingmax.php
======================
更新
svn up
======================
删除文件
svn delete ./model/Lingmax.php
=======================
上传中断 锁住文件了
到上级目录 cd ../
svn cleanup
======================
svn冲突解决 svn revert --depth=infinity /home/www
