SVN命令备忘录

批量添加(先添加再上传)

svn ci -m '' ./

亲测可用

https://blog.csdn.net/jw20082009jw/article/details/70184559

批量删除(先删除再上传)

svn st | awk '{if ($1 == "!") {print $2}}' | xargs svn rm

svn ci -m '' ./

亲测可用

https://www.cnblogs.com/kyoung/p/6933528.html

比较版本差异

svn diff Script/activity/CannonKing.js -r208:209

创建分支

svn cp -m 'create branch' http://www.svnchina.com/svn/bobo_game/mrsd http://www.svnchina.com/svn/bobo_game/mrsdfb

从主干合并到分支

svn merge http://www.svnchina.com/svn/bobo_game/mrsd/Script ./Script

GIT相关命令

首先指定目录并add相关修改(增删改)

然后commit->push(无需指定目录)

事前最好拉到最新代码pull

拉新分支

git checkout --track origin/PlayBalls_facebook

切换分支

git checkout master

git checkout PlayBalls_facebook

git status

git add .

git add -A

git commit -m "xxxx"

git push

git log ./script/yixia/code/prefab/Map.js

git diff d6be022c3b07be602230958d8d5671858035b48a ./script/yixia/code/prefab/Map.js

巴特西