From 94acd18075e054e472584003a35169772e92c0d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8C=97=E6=9E=B3?= <7854742+wang_rumeng@user.noreply.gitee.com> Date: Fri, 4 Jul 2025 16:29:07 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BC=96=E8=AF=91=E8=84=9A?= =?UTF-8?q?=E6=9C=AC=E4=B8=AD=E7=9A=84=E8=BF=9C=E7=A8=8B=E4=BB=93=E5=BA=93?= =?UTF-8?q?=E5=BC=95=E7=94=A8=EF=BC=8C=E4=BB=8Eorigin=E6=94=B9=E4=B8=BAmov?= =?UTF-8?q?ie-flow?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- compile.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/compile.sh b/compile.sh index 61ad53b..035b345 100755 --- a/compile.sh +++ b/compile.sh @@ -26,18 +26,18 @@ fi # 获取最新的远程分支信息 echo "正在获取最新的远程分支信息..." | tee -a $LOGFILE -git fetch origin +git fetch movie-flow # 检查远程分支是否和本地分支一致 local_commit=$(git rev-parse HEAD) -remote_commit=$(git rev-parse origin/dev) +remote_commit=$(git rev-parse movie-flow/dev) if [ "$local_commit" != "$remote_commit" ]; then echo "本地分支和远程分支不一致" | tee -a $LOGFILE echo "本地分支: $local_commit" | tee -a $LOGFILE echo "远程分支: $remote_commit" | tee -a $LOGFILE echo "请运行以下命令之一来解决:" | tee -a $LOGFILE - echo " git pull origin dev # 如果远程有新提交" | tee -a $LOGFILE - echo " git push origin dev # 如果本地有新提交" | tee -a $LOGFILE + echo " git pull movie-flow dev # 如果远程有新提交" | tee -a $LOGFILE + echo " git push movie-flow dev # 如果本地有新提交" | tee -a $LOGFILE exit 1 fi