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 无新任务