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

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

Browse Source
This commit is contained in:
cfdaily
2026-03-23 19:02:36 +08:00
parent 031ce1de13
commit d6177d9217
3 changed files with 48 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
guanyu_monitor.log
+21
View File
@@ -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 无新任务
management/tasks/pending/TASK-20260323190236.md
+6
View File
@@ -0,0 +1,6 @@
# 任务ID: TASK-20260323190236
# 状态: pending
# 创建时间: Mon Mar 23 19:02:36 CST 2026
## 任务需求
压力测试 19:02:36: 持续稳定性测试，验证系统在连续负载下的git容错处理
zhangfei_monitor.log
+21
View File
@@ -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 无新任务