From c6cf5a6351d8c4927804df3e7ab0f52b16279c3b Mon Sep 17 00:00:00 2001
From: starmen1265 <starmen1265@163.com>
Date: Mon, 9 Mar 2026 22:56:28 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BD=BF=E7=94=A8=20reset=20--hard=20?=
 =?UTF-8?q?=E9=81=BF=E5=85=8D=20CI=20=E9=83=A8=E7=BD=B2=E6=97=B6=E6=9C=AA?=
 =?UTF-8?q?=E8=B7=9F=E8=B8=AA=E6=96=87=E4=BB=B6=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitea/workflows/deploy.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index 48b1b8f..11984c8 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -14,5 +14,7 @@ jobs:
           cd /home/starmen1265/.openclaw/agents/knowledge-base/workspace/skills
           # 确保使用 SSH config 别名
           git remote set-url origin ssh://gitea-nas/starmen1265/kb-skills.git
-          git pull origin main
+          git fetch origin
+          # 强制重置到远程状态，避免未跟踪文件冲突
+          git reset --hard origin/main
           echo "✅ Deployed at $(date)"