svn

https://blog.csdn.net/daocaoren1543169565/article/details/78890708

svn cp -m "create branch" http://svn.i.myhug.cn:88/svn/baobao/recommend/ http://svn.i.myhug.cn:88/svn/baobao/recommend/shigu

从远程服务器拉最新代码：

svn update

提交本地代码：

svn ci -m '修改内容'

报错：svn error "svn: Aborting commit: xxx remains in conflict"?

使用svn resolved /Users/mac/data/lz/core/lz.php来回滚

冲突：

svn revert --depth=infinity pythonresource.txt