From 837f801a2155d698b5065080dbd25b8dacf707bb Mon Sep 17 00:00:00 2001
From: cfdaily <cfdaily@gitee.com>
Date: Mon, 23 Mar 2026 19:45:57 +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?20260323194556]?=
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 4bde2c85f..7a86dab50 100644
--- a/guanyu_monitor.log
+++ b/guanyu_monitor.log
@@ -7286,3 +7286,21 @@ to recover.
 [2026-03-23 19:45:25] ⚠️ git pull失败，继续检查
 [2026-03-23 19:45:25] ⚠️ git pull失败，继续检查
 [2026-03-23 19:45:25] 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 29062eb895557398468382c9373fe257e1e33324.
+error: The following untracked working tree files would be overwritten by merge:
+	management/tasks/pending/TASK-20260323194556.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 29062eb895557398468382c9373fe257e1e33324
+output, run
+$ git reset --hard
+to recover.
+[2026-03-23 19:45:56] ⚠️ git pull失败，继续检查
+[2026-03-23 19:45:56] ⚠️ git pull失败，继续检查
+[2026-03-23 19:45:56] guanyu 无新任务
diff --git a/zhaoyun_monitor.log b/zhaoyun_monitor.log
index 76530a823..ee8718d16 100644
--- a/zhaoyun_monitor.log
+++ b/zhaoyun_monitor.log
@@ -5826,3 +5826,21 @@ to recover.
 [2026-03-23 19:45:25] ⚠️ git pull失败，继续检查
 [2026-03-23 19:45:25] ⚠️ git pull失败，继续检查
 [2026-03-23 19:45:25] 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 29062eb895557398468382c9373fe257e1e33324.
+error: The following untracked working tree files would be overwritten by merge:
+	management/tasks/pending/TASK-20260323194556.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 29062eb895557398468382c9373fe257e1e33324
+output, run
+$ git reset --hard
+to recover.
+[2026-03-23 19:45:56] ⚠️ git pull失败，继续检查
+[2026-03-23 19:45:56] ⚠️ git pull失败，继续检查
+[2026-03-23 19:45:56] zhaoyun 无新任务