fix: 部署机强制同步远程代码，避免本地修改阻塞

2026-06-21 22:12:45 +08:00
parent f5f19fe7ac
commit ae9a44a95a
1 changed files with 2 additions and 1 deletions
@@ -16,7 +16,8 @@ error() { echo -e "${RED}[✗]${NC} $1"; exit 1; }
 # ========== 1. 更新代码 ==========
 echo ""
 info "拉取最新代码..."
-git pull --rebase || error "git pull 失败，请检查网络或冲突"
+git fetch origin && git reset --hard origin/main || error "拉取代码失败，请检查网络"
+info "已同步至最新版本: $(git log --oneline -1)"

 # ========== 2. 环境检查 ==========
 echo ""