diff --git a/deploy.sh b/deploy.sh index 246c673..d47d602 100644 --- a/deploy.sh +++ b/deploy.sh @@ -16,8 +16,7 @@ error() { echo -e "${RED}[✗]${NC} $1"; exit 1; } # ========== 1. 更新代码 ========== echo "" info "拉取最新代码..." -git fetch origin && git reset --hard origin/main || error "拉取代码失败,请检查网络" -info "已同步至最新版本: $(git log --oneline -1)" +git pull --rebase || error "git pull 失败,请检查网络或冲突" # ========== 2. 环境检查 ========== echo ""