From b24a90d371d1559b7df10b75120216a339b4f2fe Mon Sep 17 00:00:00 2001
From: cfdaily <cfdaily@gitee.com>
Date: Mon, 23 Mar 2026 19:49:02 +0800
Subject: [PATCH] =?UTF-8?q?sync:=20=E8=87=AA=E5=8A=A8=E5=90=8C=E6=AD=A5?=
 =?UTF-8?q?=E6=9C=AA=E6=8F=90=E4=BA=A4=E5=8F=98=E6=9B=B4=20[create=20TASK-?=
 =?UTF-8?q?20260323194902]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 guanyu_monitor.log  | 18 ++++++++++++++++++
 zhaoyun_monitor.log | 18 ++++++++++++++++++
 2 files changed, 36 insertions(+)

diff --git a/guanyu_monitor.log b/guanyu_monitor.log
index d60033743..79c42e0b3 100644
--- a/guanyu_monitor.log
+++ b/guanyu_monitor.log
@@ -7361,3 +7361,21 @@ to recover.
 [2026-03-23 19:48:30] ⚠️ git pull失败，继续检查
 [2026-03-23 19:48:30] ⚠️ git pull失败，继续检查
 [2026-03-23 19:48:30] guanyu 无新任务
+From gitee.com:cfdaily/sanguo_quant_live
+ * branch            main       -> FETCH_HEAD
+warning: fetch updated the current branch head.
+fast-forwarding your working tree from
+commit 3f9da995d42617783602d2fa9aa9d9ad7625df48.
+error: The following untracked working tree files would be overwritten by merge:
+	management/tasks/pending/TASK-20260323194902.md
+Please move or remove them before you merge.
+Aborting
+fatal: Cannot fast-forward your working tree.
+After making sure that you saved anything precious from
+$ git diff 3f9da995d42617783602d2fa9aa9d9ad7625df48
+output, run
+$ git reset --hard
+to recover.
+[2026-03-23 19:49:01] ⚠️ git pull失败，继续检查
+[2026-03-23 19:49:01] ⚠️ git pull失败，继续检查
+[2026-03-23 19:49:01] guanyu 无新任务
diff --git a/zhaoyun_monitor.log b/zhaoyun_monitor.log
index d13b9f2bf..1a586af8a 100644
--- a/zhaoyun_monitor.log
+++ b/zhaoyun_monitor.log
@@ -5913,3 +5913,21 @@ to recover.
 [2026-03-23 19:48:30] ⚠️ git pull失败，继续检查
 [2026-03-23 19:48:30] ⚠️ git pull失败，继续检查
 [2026-03-23 19:48:30] zhaoyun 无新任务
+From gitee.com:cfdaily/sanguo_quant_live
+ * branch            main       -> FETCH_HEAD
+warning: fetch updated the current branch head.
+fast-forwarding your working tree from
+commit 3f9da995d42617783602d2fa9aa9d9ad7625df48.
+error: The following untracked working tree files would be overwritten by merge:
+	management/tasks/pending/TASK-20260323194902.md
+Please move or remove them before you merge.
+Aborting
+fatal: Cannot fast-forward your working tree.
+After making sure that you saved anything precious from
+$ git diff 3f9da995d42617783602d2fa9aa9d9ad7625df48
+output, run
+$ git reset --hard
+to recover.
+[2026-03-23 19:49:01] ⚠️ git pull失败，继续检查
+[2026-03-23 19:49:01] ⚠️ git pull失败，继续检查
+[2026-03-23 19:49:01] zhaoyun 无新任务