diff --git a/guanyu_monitor.log b/guanyu_monitor.log index 04b44fd1e..d9565750d 100644 --- a/guanyu_monitor.log +++ b/guanyu_monitor.log @@ -5876,3 +5876,23 @@ Already up to date. [2026-03-23 18:47:39] 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 a4590190f38a52cf8e53518578911b23122e3951. +error: Your local changes to the following files would be overwritten by merge: + guanyu_monitor.log + 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-20260323184810.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 a4590190f38a52cf8e53518578911b23122e3951 +output, run +$ git reset --hard +to recover. +[2026-03-23 18:48:09] ⚠️ git pull失败,继续检查 +[2026-03-23 18:48:09] ⚠️ git pull失败,继续检查 +[2026-03-23 18:48:09] guanyu 无新任务 diff --git a/management/tasks/pending/TASK-20260323184811.md b/management/tasks/pending/TASK-20260323184811.md new file mode 100644 index 000000000..78f1a5c62 --- /dev/null +++ b/management/tasks/pending/TASK-20260323184811.md @@ -0,0 +1,6 @@ +# 任务ID: TASK-20260323184811 +# 状态: pending +# 创建时间: Mon Mar 23 18:48:11 CST 2026 + +## 任务需求 +压力测试 18:48:11: 持续稳定性测试,验证系统在连续负载下的git容错处理 diff --git a/zhangfei_monitor.log b/zhangfei_monitor.log index 6f080884c..f3670b4b2 100644 --- a/zhangfei_monitor.log +++ b/zhangfei_monitor.log @@ -4574,3 +4574,25 @@ Already up to date. [2026-03-23 18:47:39] ✅ git pull成功 [2026-03-23 18:47:39] ✅ git pull成功 [2026-03-23 18:47:39] 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 a4590190f38a52cf8e53518578911b23122e3951. +error: Your local changes to the following files would be overwritten by merge: + guanyu_monitor.log + 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-20260323184810.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 a4590190f38a52cf8e53518578911b23122e3951 +output, run +$ git reset --hard +to recover. +[2026-03-23 18:48:10] ⚠️ git pull失败,继续检查 +[2026-03-23 18:48:10] ⚠️ git pull失败,继续检查 +[2026-03-23 18:48:10] zhangfei 无新任务