fix: 使用 reset --hard 避免 CI 部署时未跟踪文件冲突

2026-03-09 22:56:28 +08:00
parent fd7d1aafb1
commit c6cf5a6351
1 changed files with 3 additions and 1 deletions
@@ -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)"