From f3ec850e785789eef2d176b1babc264701ad8346 Mon Sep 17 00:00:00 2001
From: cfdaily <cfdaily@gitee.com>
Date: Mon, 23 Mar 2026 18:49:12 +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?20260323184912]?=
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 71f6a31ad..156b91667 100644
--- a/guanyu_monitor.log
+++ b/guanyu_monitor.log
@@ -5902,3 +5902,21 @@ Already up to date.
 [2026-03-23 18:48:40] ✅ git pull成功
 [2026-03-23 18:48:40] ✅ git pull成功
 [2026-03-23 18:48:40] 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 c15742166d3ec8c9cee9341ddfa70803bacfb296.
+error: The following untracked working tree files would be overwritten by merge:
+	management/tasks/pending/TASK-20260323184912.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 c15742166d3ec8c9cee9341ddfa70803bacfb296
+output, run
+$ git reset --hard
+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 无新任务
diff --git a/zhaoyun_monitor.log b/zhaoyun_monitor.log
index 58990309f..272be96fe 100644
--- a/zhaoyun_monitor.log
+++ b/zhaoyun_monitor.log
@@ -4591,3 +4591,21 @@ Already up to date.
 [2026-03-23 18:48:40] ✅ git pull成功
 [2026-03-23 18:48:40] ✅ git pull成功
 [2026-03-23 18:48:40] 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 c15742166d3ec8c9cee9341ddfa70803bacfb296.
+error: The following untracked working tree files would be overwritten by merge:
+	management/tasks/pending/TASK-20260323184912.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 c15742166d3ec8c9cee9341ddfa70803bacfb296
+output, run
+$ git reset --hard
+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 无新任务