lkddi/chatroom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity

修复：部署脚本拉取前自动重置 lock 文件，防止服务器环境差异造成合并冲突

Browse Source
This commit is contained in:
流星
2026-03-05 11:49:45 +08:00
parent 5864478ae0
commit 148c91a61c
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
deploy_update.sh
+2 -1
View File
@@ -15,8 +15,9 @@ echo -e "${BLUE}========================================${NC}"
cd "$PROJECT_ROOT" || { echo -e "${RED}❌ 无法进入项目目录：$PROJECT_ROOT${NC}"; exit 1; } cd "$PROJECT_ROOT" || { echo -e "${RED}❌ 无法进入项目目录：$PROJECT_ROOT${NC}"; exit 1; }
# 1. Git Pull # 1. Git Pull（先重置 lock 文件，避免服务器环境差异导致冲突）
echo -e "${YELLOW}[1/7] 拉取代码...${NC}" echo -e "${YELLOW}[1/7] 拉取代码...${NC}"
git checkout -- composer.lock package-lock.json 2>/dev/null || true
git fetch origin && git pull origin master git fetch origin && git pull origin master
if [ $? -ne 0 ]; then echo -e "${RED}❌ Git 失败${NC}"; exit 1; fi if [ $? -ne 0 ]; then echo -e "${RED}❌ Git 失败${NC}"; exit 1; fi