From 75759a2898f5d3809c303e2b2b3ad9125cff931d Mon Sep 17 00:00:00 2001
From: xiaji <rembme@163.com>
Date: Mon, 5 Jan 2026 20:21:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E5=BC=BA=E5=88=B6?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0git=E7=9A=84=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 412842c..6a7b53a 100644
--- a/README.md
+++ b/README.md
@@ -356,7 +356,14 @@ sudo ufw enable
 ```bash
 cd /var/www/diary-family
 
-# 拉取最新代码
+# 1. 先拉取远程最新代码（只获取，不合并）
+git fetch origin
+
+# 2. 硬重置本地分支到远程分支的最新版本（会覆盖所有本地未提交修改）
+# 注意：将 main 替换为你的分支名（如 master、dev 等）
+git reset --hard origin/main
+
+# 3. 拉取最新代码
 git pull http://14.103.237.41:16001/xiaji/diary-family.git
 
 # 激活虚拟环境