From 570dc82125f097bddb6ceb8c19b0da1f0a0a0f05 Mon Sep 17 00:00:00 2001
From: kevin <kevin@lmve.net>
Date: Tue, 7 Jul 2026 15:11:06 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20install=5Flinux.sh=20=E5=BC=BA=E5=88=B6?=
 =?UTF-8?q?=E8=A6=86=E7=9B=96=E6=9C=AC=E5=9C=B0=E4=BF=AE=E6=94=B9=EF=BC=8C?=
 =?UTF-8?q?=E8=A7=A3=E5=86=B3=20pull=20=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git pull 改为 git fetch + git reset --hard origin/main，
避免 npm install 修改 package-lock.json 后部署拉取失败
---
 install_linux.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/install_linux.sh b/install_linux.sh
index bc3de5e..476937f 100755
--- a/install_linux.sh
+++ b/install_linux.sh
@@ -14,8 +14,9 @@ if [ "$(id -u)" -ne 0 ]; then
     exit 1
 fi
 
-echo ">>> 拉取最新代码..."
-git pull
+echo ">>> 拉取最新代码（强制覆盖本地修改）..."
+git fetch origin
+git reset --hard origin/main
 
 echo ">>> 安装前端依赖并构建..."
 cd frontend