diff --git a/zhangfei_monitor.log b/zhangfei_monitor.log index dfff2e547..410697125 100644 --- a/zhangfei_monitor.log +++ b/zhangfei_monitor.log @@ -6145,3 +6145,21 @@ Already up to date. [2026-03-23 19:49:04] ✅ git pull成功 [2026-03-23 19:49:04] ✅ git pull成功 [2026-03-23 19:49:04] 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 dc3de11df061343e844e956dcf9465fba2a1629b. +error: The following untracked working tree files would be overwritten by merge: + management/tasks/pending/TASK-20260323194935.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 dc3de11df061343e844e956dcf9465fba2a1629b +output, run +$ git reset --hard +to recover. +[2026-03-23 19:49:34] ⚠️ git pull失败,继续检查 +[2026-03-23 19:49:34] ⚠️ git pull失败,继续检查 +[2026-03-23 19:49:34] zhangfei 无新任务