diff --git a/guanyu_monitor.log b/guanyu_monitor.log index d60033743..79c42e0b3 100644 --- a/guanyu_monitor.log +++ b/guanyu_monitor.log @@ -7361,3 +7361,21 @@ to recover. [2026-03-23 19:48:30] ⚠️ git pull失败,继续检查 [2026-03-23 19:48:30] ⚠️ git pull失败,继续检查 [2026-03-23 19:48:30] 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 3f9da995d42617783602d2fa9aa9d9ad7625df48. +error: The following untracked working tree files would be overwritten by merge: + management/tasks/pending/TASK-20260323194902.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 3f9da995d42617783602d2fa9aa9d9ad7625df48 +output, run +$ git reset --hard +to recover. +[2026-03-23 19:49:01] ⚠️ git pull失败,继续检查 +[2026-03-23 19:49:01] ⚠️ git pull失败,继续检查 +[2026-03-23 19:49:01] guanyu 无新任务 diff --git a/zhaoyun_monitor.log b/zhaoyun_monitor.log index d13b9f2bf..1a586af8a 100644 --- a/zhaoyun_monitor.log +++ b/zhaoyun_monitor.log @@ -5913,3 +5913,21 @@ to recover. [2026-03-23 19:48:30] ⚠️ git pull失败,继续检查 [2026-03-23 19:48:30] ⚠️ git pull失败,继续检查 [2026-03-23 19:48:30] 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 3f9da995d42617783602d2fa9aa9d9ad7625df48. +error: The following untracked working tree files would be overwritten by merge: + management/tasks/pending/TASK-20260323194902.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 3f9da995d42617783602d2fa9aa9d9ad7625df48 +output, run +$ git reset --hard +to recover. +[2026-03-23 19:49:01] ⚠️ git pull失败,继续检查 +[2026-03-23 19:49:01] ⚠️ git pull失败,继续检查 +[2026-03-23 19:49:01] zhaoyun 无新任务