diff --git a/trunk/scripts/csdn.mirror.sh b/trunk/scripts/csdn.mirror.sh index 6993e9577..e6e26a461 100755 --- a/trunk/scripts/csdn.mirror.sh +++ b/trunk/scripts/csdn.mirror.sh @@ -65,6 +65,10 @@ for ((;;)); do break done +git checkout master && git merge srs.master +ret=$?; if [[ 0 -ne $ret ]]; then failed_msg "(master)合并github分支失败, ret=$ret"; exit $ret; fi +ok_msg "(master)合并github分支成功" + ############################################# # branch 1.0release #############################################