From cbf7305ecd00b7a47478a5756e2c4d2fa245a4ab Mon Sep 17 00:00:00 2001
From: cfdaily <cfdaily@gitee.com>
Date: Mon, 23 Mar 2026 18:49:43 +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?20260323184943]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 guanyu_monitor.log   | 18 ++++++++++++++++++
 zhangfei_monitor.log |  6 ++++++
 zhaoyun_monitor.log  | 18 ++++++++++++++++++
 3 files changed, 42 insertions(+)

diff --git a/guanyu_monitor.log b/guanyu_monitor.log
index 156b91667..ecad216ad 100644
--- a/guanyu_monitor.log
+++ b/guanyu_monitor.log
@@ -5920,3 +5920,21 @@ to recover.
 [2026-03-23 18:49:11] ⚠️ git pull失败，继续检查
 [2026-03-23 18:49:11] ⚠️ git pull失败，继续检查
 [2026-03-23 18:49:11] 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 d3cad6c2410f46c145089ebce73795c2623ec720.
+error: The following untracked working tree files would be overwritten by merge:
+	management/tasks/pending/TASK-20260323184943.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 d3cad6c2410f46c145089ebce73795c2623ec720
+output, run
+$ git reset --hard
+to recover.
+[2026-03-23 18:49:42] ⚠️ git pull失败，继续检查
+[2026-03-23 18:49:42] ⚠️ git pull失败，继续检查
+[2026-03-23 18:49:42] guanyu 无新任务
diff --git a/zhangfei_monitor.log b/zhangfei_monitor.log
index fb14e43fc..c549581b1 100644
--- a/zhangfei_monitor.log
+++ b/zhangfei_monitor.log
@@ -4637,3 +4637,9 @@ to recover.
 [2026-03-23 18:49:12] ⚠️ git pull失败，继续检查
 [2026-03-23 18:49:12] ⚠️ git pull失败，继续检查
 [2026-03-23 18:49:12] zhangfei 无新任务
+From gitee.com:cfdaily/sanguo_quant_live
+ * branch            main       -> FETCH_HEAD
+Already up to date.
+[2026-03-23 18:49:43] ✅ git pull成功
+[2026-03-23 18:49:43] ✅ git pull成功
+[2026-03-23 18:49:43] zhangfei 无新任务
diff --git a/zhaoyun_monitor.log b/zhaoyun_monitor.log
index 272be96fe..d077e3d52 100644
--- a/zhaoyun_monitor.log
+++ b/zhaoyun_monitor.log
@@ -4609,3 +4609,21 @@ to recover.
 [2026-03-23 18:49:11] ⚠️ git pull失败，继续检查
 [2026-03-23 18:49:11] ⚠️ git pull失败，继续检查
 [2026-03-23 18:49:11] 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 d3cad6c2410f46c145089ebce73795c2623ec720.
+error: The following untracked working tree files would be overwritten by merge:
+	management/tasks/pending/TASK-20260323184943.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 d3cad6c2410f46c145089ebce73795c2623ec720
+output, run
+$ git reset --hard
+to recover.
+[2026-03-23 18:49:42] ⚠️ git pull失败，继续检查
+[2026-03-23 18:49:42] ⚠️ git pull失败，继续检查
+[2026-03-23 18:49:42] zhaoyun 无新任务