fix: install_linux.sh 强制覆盖本地修改,解决 pull 冲突
git pull 改为 git fetch + git reset --hard origin/main, 避免 npm install 修改 package-lock.json 后部署拉取失败
This commit is contained in:
+3
-2
@@ -14,8 +14,9 @@ if [ "$(id -u)" -ne 0 ]; then
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo ">>> 拉取最新代码..."
|
echo ">>> 拉取最新代码(强制覆盖本地修改)..."
|
||||||
git pull
|
git fetch origin
|
||||||
|
git reset --hard origin/main
|
||||||
|
|
||||||
echo ">>> 安装前端依赖并构建..."
|
echo ">>> 安装前端依赖并构建..."
|
||||||
cd frontend
|
cd frontend
|
||||||
|
|||||||
Reference in New Issue
Block a user