sync: 自动同步未提交变更 [create TASK-20260323195137]
This commit is contained in:
@@ -7427,3 +7427,21 @@ to recover.
|
|||||||
[2026-03-23 19:51:05] ⚠️ git pull失败,继续检查
|
[2026-03-23 19:51:05] ⚠️ git pull失败,继续检查
|
||||||
[2026-03-23 19:51:05] ⚠️ git pull失败,继续检查
|
[2026-03-23 19:51:05] ⚠️ git pull失败,继续检查
|
||||||
[2026-03-23 19:51:05] guanyu 无新任务
|
[2026-03-23 19:51:05] 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 6346ab0f82b723df6db0d998018179c3f6ce7ede.
|
||||||
|
error: The following untracked working tree files would be overwritten by merge:
|
||||||
|
management/tasks/pending/TASK-20260323195136.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 6346ab0f82b723df6db0d998018179c3f6ce7ede
|
||||||
|
output, run
|
||||||
|
$ git reset --hard
|
||||||
|
to recover.
|
||||||
|
[2026-03-23 19:51:36] ⚠️ git pull失败,继续检查
|
||||||
|
[2026-03-23 19:51:36] ⚠️ git pull失败,继续检查
|
||||||
|
[2026-03-23 19:51:36] guanyu 无新任务
|
||||||
|
|||||||
@@ -0,0 +1,7 @@
|
|||||||
|
# 任务ID: TASK-20260323195137
|
||||||
|
# 状态: pending
|
||||||
|
# 负责人:
|
||||||
|
# 创建时间: Mon Mar 23 19:51:37 CST 2026
|
||||||
|
|
||||||
|
## 任务需求
|
||||||
|
持续压力测试 Mon Mar 23 19:51:37 CST 2026: 验证高并发下系统稳定性,测试git容错修复效果
|
||||||
@@ -5979,3 +5979,21 @@ to recover.
|
|||||||
[2026-03-23 19:51:05] ⚠️ git pull失败,继续检查
|
[2026-03-23 19:51:05] ⚠️ git pull失败,继续检查
|
||||||
[2026-03-23 19:51:05] ⚠️ git pull失败,继续检查
|
[2026-03-23 19:51:05] ⚠️ git pull失败,继续检查
|
||||||
[2026-03-23 19:51:05] zhaoyun 无新任务
|
[2026-03-23 19:51:05] 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 6346ab0f82b723df6db0d998018179c3f6ce7ede.
|
||||||
|
error: The following untracked working tree files would be overwritten by merge:
|
||||||
|
management/tasks/pending/TASK-20260323195136.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 6346ab0f82b723df6db0d998018179c3f6ce7ede
|
||||||
|
output, run
|
||||||
|
$ git reset --hard
|
||||||
|
to recover.
|
||||||
|
[2026-03-23 19:51:36] ⚠️ git pull失败,继续检查
|
||||||
|
[2026-03-23 19:51:36] ⚠️ git pull失败,继续检查
|
||||||
|
[2026-03-23 19:51:36] zhaoyun 无新任务
|
||||||
|
|||||||
Reference in New Issue
Block a user