revert: 恢复 git pull --rebase，部署机自行处理冲突

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