diff --git a/pangtong_monitor.log b/pangtong_monitor.log index 9ea6118b2..a658081ae 100644 --- a/pangtong_monitor.log +++ b/pangtong_monitor.log @@ -5675,3 +5675,20 @@ $ git reset --hard to recover. [2026-03-23 18:54:27] ⚠️ git pull失败,继续检查 [2026-03-23 18:54:27] pangtong 无新任务 +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 e31c96f14b32461046ff877296ce8ec30d2f7140. +error: The following untracked working tree files would be overwritten by merge: + management/tasks/pending/TASK-20260323185459.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 e31c96f14b32461046ff877296ce8ec30d2f7140 +output, run +$ git reset --hard +to recover. +[2026-03-23 18:54:58] ⚠️ git pull失败,继续检查 +[2026-03-23 18:54:58] pangtong 无新任务