sync: 自动同步未提交变更 [create TASK-20260323195646]

This commit is contained in:
cfdaily
2026-03-23 19:56:46 +08:00
parent 9d3c4db6f3
commit 57bc2021fb
3 changed files with 43 additions and 0 deletions
+18
View File
@@ -7595,3 +7595,21 @@ to recover.
[2026-03-23 19:56:13] ⚠️ git pull失败,继续检查
[2026-03-23 19:56:13] ⚠️ git pull失败,继续检查
[2026-03-23 19:56:13] 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 b47457580f395c223c6792a9ae537253fe2095c7.
error: The following untracked working tree files would be overwritten by merge:
management/tasks/pending/TASK-20260323195645.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 b47457580f395c223c6792a9ae537253fe2095c7
output, run
$ git reset --hard
to recover.
[2026-03-23 19:56:44] ⚠️ git pull失败,继续检查
[2026-03-23 19:56:44] ⚠️ git pull失败,继续检查
[2026-03-23 19:56:44] guanyu 无新任务
@@ -0,0 +1,7 @@
# 任务ID: TASK-20260323195646
# 状态: pending
# 负责人:
# 创建时间: Mon Mar 23 19:56:46 CST 2026
## 任务需求
持续压力测试 Mon Mar 23 19:56:46 CST 2026: 验证高并发下系统稳定性,测试git容错修复效果
+18
View File
@@ -6147,3 +6147,21 @@ to recover.
[2026-03-23 19:56:13] ⚠️ git pull失败,继续检查
[2026-03-23 19:56:13] ⚠️ git pull失败,继续检查
[2026-03-23 19:56:13] 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 b47457580f395c223c6792a9ae537253fe2095c7.
error: The following untracked working tree files would be overwritten by merge:
management/tasks/pending/TASK-20260323195645.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 b47457580f395c223c6792a9ae537253fe2095c7
output, run
$ git reset --hard
to recover.
[2026-03-23 19:56:44] ⚠️ git pull失败,继续检查
[2026-03-23 19:56:44] ⚠️ git pull失败,继续检查
[2026-03-23 19:56:44] zhaoyun 无新任务