1

商城_run.sh

@@ -141,11 +141,25 @@ set_branches(){
 # 函数：拉取项目代码
 pull_project() {
     if [ -d "$project_dir/.git" ]; then
-      echo_content "green" "$runprojects 项目存在 直接跳过..."
-      return
+        echo_content "green" "$runprojects 项目存在，开始更新代码..."
+
+        # 进入项目目录
+        cd "$project_dir" || exit 1
+
+        # 更新代码，如果有冲突时使用本地版本
+        git fetch origin
+        git merge -X ours origin/main  # 使用 'ours' 策略以本地为主
+        if [ $? -ne 0 ]; then
+            echo_content "red" "更新代码失败，请手动检查冲突。"
+            exit 1
+        fi
+
+        echo_content "green" "代码更新完成。"
+        return
     fi
 
     echo_content "green" "$runprojects 项目本地未安装，开始拉取..."
+    
     # 检查凭据是否存在
     if [ -f "$CREDENTIALS_FILE" ]; then
         source "$CREDENTIALS_FILE"
@@ -155,10 +169,12 @@ pull_project() {
        
         echo "请输入 Git 密码:"
         read -s -p "密码: " git_password
+        echo  # 换行
 
         # 询问是否保存凭据
         echo "是否保存凭据到 $CREDENTIALS_FILE 以便下次使用？"
         read -p "请选择(y/n): " save_credentials
+        echo  # 换行
         if [ "$save_credentials" = "y" ]; then
             echo "git_username=\"$git_username\"" > "$CREDENTIALS_FILE"
             echo "git_password=\"$git_password\"" >> "$CREDENTIALS_FILE"