diff --git a/guanyu_monitor.log b/guanyu_monitor.log index 4ae94e270..cf39dbb60 100644 --- a/guanyu_monitor.log +++ b/guanyu_monitor.log @@ -6316,3 +6316,24 @@ to recover. [2026-03-23 19:02:03] ⚠️ git pull失败,继续检查 [2026-03-23 19:02:03] ⚠️ git pull失败,继续检查 [2026-03-23 19:02:03] 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 81cc3a66e31dc5d380f2f37aa39e6b6b8ed9fbbc. +error: Your local changes to the following files would be overwritten by merge: + 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-20260323190235.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 81cc3a66e31dc5d380f2f37aa39e6b6b8ed9fbbc +output, run +$ git reset --hard +to recover. +[2026-03-23 19:02:34] ⚠️ git pull失败,继续检查 +[2026-03-23 19:02:34] ⚠️ git pull失败,继续检查 +[2026-03-23 19:02:34] guanyu 无新任务 diff --git a/management/tasks/pending/TASK-20260323190236.md b/management/tasks/pending/TASK-20260323190236.md new file mode 100644 index 000000000..2edacb2c1 --- /dev/null +++ b/management/tasks/pending/TASK-20260323190236.md @@ -0,0 +1,6 @@ +# 任务ID: TASK-20260323190236 +# 状态: pending +# 创建时间: Mon Mar 23 19:02:36 CST 2026 + +## 任务需求 +压力测试 19:02:36: 持续稳定性测试,验证系统在连续负载下的git容错处理 diff --git a/zhangfei_monitor.log b/zhangfei_monitor.log index 8e5855448..d8594232d 100644 --- a/zhangfei_monitor.log +++ b/zhangfei_monitor.log @@ -5081,3 +5081,24 @@ to recover. [2026-03-23 19:02:03] ⚠️ git pull失败,继续检查 [2026-03-23 19:02:03] ⚠️ git pull失败,继续检查 [2026-03-23 19:02:03] 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 81cc3a66e31dc5d380f2f37aa39e6b6b8ed9fbbc. +error: Your local changes to the following files would be overwritten by merge: + 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-20260323190235.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 81cc3a66e31dc5d380f2f37aa39e6b6b8ed9fbbc +output, run +$ git reset --hard +to recover. +[2026-03-23 19:02:34] ⚠️ git pull失败,继续检查 +[2026-03-23 19:02:34] ⚠️ git pull失败,继续检查 +[2026-03-23 19:02:34] zhangfei 无新任务