refactor(release): replace git merge with git rebase for dev branch

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/） ==="

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/） ==="