From 2362e13ef02af5d1e6eda2b7f693c5be2ecd2889 Mon Sep 17 00:00:00 2001
From: cnphpbb <moqiruyi@126.com>
Date: Thu, 31 Jul 2025 06:41:48 +0800
Subject: [PATCH] =?UTF-8?q?fix(shell):=20=E6=9B=BF=E6=8D=A2run.sh=E4=B8=AD?=
 =?UTF-8?q?=E7=9A=84echo=E8=AF=AD=E5=8F=A5=E4=B8=BAgit=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E5=87=BD=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

添加updatesh函数来处理git仓库更新，解决分支冲突问题
---
 shell/run.sh | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/shell/run.sh b/shell/run.sh
index cdd1d79..74701ba 100644
--- a/shell/run.sh
+++ b/shell/run.sh
@@ -1,9 +1,16 @@
 #!/usr/bin/env bash
+#报错:
+# hint: You have divergent branches and need to specify how to reconcile them. hint: You can do so by running one of the following commands sometime before hint: your next pull: hint: hint: git config pull.rebase false # merge hint: git config pull.rebase true # rebase hint: git config pull.ff only # fast-forward only hint: hint: You can replace "git config" with "git config --global" to set a default hint: preference for all repositories. You can also pass --rebase, --no-rebase, hint: or --ff-only on the command line to override the configured default per hint: invocation. fatal: Need to specify how to reconcile divergent branches.
+
+#解决:
+# git config pull.rebase false
+updatesh() {
+    local dir=$1
+    echo "update ${dir}"
+    cd ${dir} && git fetch --all && git reset --hard origin/main && git pull
+}
+
+# 调用函数
+updatesh "/data/deploy.stack"
+
 
-echo "run.sh 1"
-echo "run.sh 2"
-echo "run.sh 3"
-echo "run.sh 4"
-echo "run.sh 5"
-echo "run.sh 6"
-echo "run.sh 7"