diff --git a/zhangfei_monitor.log b/zhangfei_monitor.log index 9167d4b6e..e27b48ef3 100644 --- a/zhangfei_monitor.log +++ b/zhangfei_monitor.log @@ -5167,3 +5167,25 @@ to recover. [2026-03-23 19:04:07] ⚠️ git pull失败,继续检查 [2026-03-23 19:04:07] ⚠️ git pull失败,继续检查 [2026-03-23 19:04:07] 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 f009fff9b3ddec135b20765174a6379a84b4c915. +error: Your local changes to the following files would be overwritten by merge: + guanyu_monitor.log + 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-20260323190439.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 f009fff9b3ddec135b20765174a6379a84b4c915 +output, run +$ git reset --hard +to recover. +[2026-03-23 19:04:38] ⚠️ git pull失败,继续检查 +[2026-03-23 19:04:38] ⚠️ git pull失败,继续检查 +[2026-03-23 19:04:38] zhangfei 无新任务