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

---
 guanyu_monitor.log   | 21 +++++++++++++++++++++
 zhangfei_monitor.log | 21 +++++++++++++++++++++
 2 files changed, 42 insertions(+)

diff --git a/guanyu_monitor.log b/guanyu_monitor.log
index 05b8b8006..b5d1bf40f 100644
--- a/guanyu_monitor.log
+++ b/guanyu_monitor.log
@@ -6046,3 +6046,24 @@ Already up to date.
 [2026-03-23 18:53:18] ✅ git pull成功
 [2026-03-23 18:53:18] ✅ git pull成功
 [2026-03-23 18:53:18] 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 5a96b0d85462f4b909b1904b8dd74daaea00616a.
+error: Your local changes to the following files would be overwritten by merge:
+	zhaoyun_monitor.log
+Please commit your changes or stash them before you merge.
+error: The following untracked working tree files would be overwritten by merge:
+	management/tasks/pending/TASK-20260323185350.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 5a96b0d85462f4b909b1904b8dd74daaea00616a
+output, run
+$ git reset --hard
+to recover.
+[2026-03-23 18:53:49] ⚠️ git pull失败，继续检查
+[2026-03-23 18:53:49] ⚠️ git pull失败，继续检查
+[2026-03-23 18:53:49] guanyu 无新任务
diff --git a/zhangfei_monitor.log b/zhangfei_monitor.log
index 8307c4062..4cc8579b4 100644
--- a/zhangfei_monitor.log
+++ b/zhangfei_monitor.log
@@ -4733,3 +4733,24 @@ to recover.
 [2026-03-23 18:53:19] ⚠️ git pull失败，继续检查
 [2026-03-23 18:53:19] ⚠️ git pull失败，继续检查
 [2026-03-23 18:53:19] zhangfei 无新任务
+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 5a96b0d85462f4b909b1904b8dd74daaea00616a.
+error: Your local changes to the following files would be overwritten by merge:
+	zhaoyun_monitor.log
+Please commit your changes or stash them before you merge.
+error: The following untracked working tree files would be overwritten by merge:
+	management/tasks/pending/TASK-20260323185350.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 5a96b0d85462f4b909b1904b8dd74daaea00616a
+output, run
+$ git reset --hard
+to recover.
+[2026-03-23 18:53:50] ⚠️ git pull失败，继续检查
+[2026-03-23 18:53:50] ⚠️ git pull失败，继续检查
+[2026-03-23 18:53:50] zhangfei 无新任务