From e7a3bb2dc555df6947be8338fd462fe8f9686cc0 Mon Sep 17 00:00:00 2001
From: chenhang <averych@126.com>
Date: Wed, 1 Jul 2026 14:44:02 +0800
Subject: [PATCH] refactor(release): replace git merge with git rebase for dev
 branch

---
 scripts/release/pre_release_web.sh | 4 ++--
 scripts/release/release_web.sh     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/release/pre_release_web.sh b/scripts/release/pre_release_web.sh
index 80fd2154..f2dea569 100755
--- a/scripts/release/pre_release_web.sh
+++ b/scripts/release/pre_release_web.sh
@@ -19,8 +19,8 @@ cd "$WORKTREE_PATH" || { echo "错误: 无法进入 $WORKTREE_PATH"; exit 1; }
 echo "=== 检查当前分支 ==="
 git branch --show-current
 
-echo "=== 合并 dev 分支 ==="
-git merge dev
+echo "=== 变基到 dev 分支 ==="
+git rebase dev
 
 # 复制测试环境图标（source: $WORKTREE_PATH/icons/test → dest: $WORKTREE_PATH/public/）
 echo "=== 复制测试环境图标（icons/test → public/） ==="
diff --git a/scripts/release/release_web.sh b/scripts/release/release_web.sh
index bb0661dc..e934b46e 100755
--- a/scripts/release/release_web.sh
+++ b/scripts/release/release_web.sh
@@ -9,8 +9,8 @@ cd "$WORKTREE_PATH" || { echo "错误: 无法进入 $WORKTREE_PATH"; exit 1; }
 echo "=== 检查当前分支 ==="
 git branch --show-current
 
-echo "=== 合并 dev 分支 ==="
-git merge dev
+echo "=== 变基到 dev 分支 ==="
+git rebase dev
 
 # 复制生产环境图标（source: $WORKTREE_PATH/icons/production → dest: $WORKTREE_PATH/public/）
 echo "=== 复制生产环境图标（icons/production → public/） ==="