sanguo/sanguo_quant_live
8
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
cfdaily
2026-03-23 19:54:11 +08:00
parent 584e852c22
commit 367d9ea0c8
3 changed files with 43 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
guanyu_monitor.log
+18
View File
@@ -7505,3 +7505,21 @@ Already up to date.
[2026-03-23 19:53:39] ✅ git pull成功 [2026-03-23 19:53:39] ✅ git pull成功
[2026-03-23 19:53:39] ✅ git pull成功 [2026-03-23 19:53:39] ✅ git pull成功
[2026-03-23 19:53:39] guanyu 无新任务 [2026-03-23 19:53: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 1b65ff80e45863bc6f6d0ec4c10e6af7072285dd.
error: The following untracked working tree files would be overwritten by merge:
management/tasks/pending/TASK-20260323195410.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 1b65ff80e45863bc6f6d0ec4c10e6af7072285dd
output, run
$ git reset --hard
to recover.
[2026-03-23 19:54:10] ⚠️ git pull失败，继续检查
[2026-03-23 19:54:10] ⚠️ git pull失败，继续检查
[2026-03-23 19:54:10] guanyu 无新任务
management/tasks/pending/TASK-20260323195411.md
+7
View File
@@ -0,0 +1,7 @@
# 任务ID: TASK-20260323195411
# 状态: pending
# 负责人:
# 创建时间: Mon Mar 23 19:54:11 CST 2026
## 任务需求
持续压力测试 Mon Mar 23 19:54:11 CST 2026: 验证高并发下系统稳定性，测试git容错修复效果
zhaoyun_monitor.log
+18
View File
@@ -6057,3 +6057,21 @@ Already up to date.
[2026-03-23 19:53:39] ✅ git pull成功 [2026-03-23 19:53:39] ✅ git pull成功
[2026-03-23 19:53:39] ✅ git pull成功 [2026-03-23 19:53:39] ✅ git pull成功
[2026-03-23 19:53:39] zhaoyun 无新任务 [2026-03-23 19:53:39] 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 1b65ff80e45863bc6f6d0ec4c10e6af7072285dd.
error: The following untracked working tree files would be overwritten by merge:
management/tasks/pending/TASK-20260323195410.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 1b65ff80e45863bc6f6d0ec4c10e6af7072285dd
output, run
$ git reset --hard
to recover.
[2026-03-23 19:54:10] ⚠️ git pull失败，继续检查
[2026-03-23 19:54:10] ⚠️ git pull失败，继续检查
[2026-03-23 19:54:10] zhaoyun 无新任务