From 25c8904b96415512c0232aa3cf6610c23cb275de Mon Sep 17 00:00:00 2001
From: wonder <hezhaohui0807@163.com>
Date: Sun, 21 Jun 2026 22:17:23 +0800
Subject: [PATCH] =?UTF-8?q?revert:=20=E6=81=A2=E5=A4=8D=20git=20pull=20--r?=
 =?UTF-8?q?ebase=EF=BC=8C=E9=83=A8=E7=BD=B2=E6=9C=BA=E8=87=AA=E8=A1=8C?=
 =?UTF-8?q?=E5=A4=84=E7=90=86=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 deploy.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

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 ""