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

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

Browse Source
This commit is contained in:
cfdaily
2026-03-23 19:58:49 +08:00
parent d640b1ca88
commit b0a76f891c
3 changed files with 46 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
guanyu_monitor.log
+18
View File
@@ -7661,3 +7661,21 @@ Already up to date.
[2026-03-23 19:58:17] ✅ git pull成功
[2026-03-23 19:58:17] ✅ git pull成功
[2026-03-23 19:58:17] 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 8f7b738a6169dcf85757dcc0b572c01d94f80473.
error: The following untracked working tree files would be overwritten by merge:
management/tasks/pending/TASK-20260323195848.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 8f7b738a6169dcf85757dcc0b572c01d94f80473
output, run
$ git reset --hard
to recover.
[2026-03-23 19:58:48] ⚠️ git pull失败，继续检查
[2026-03-23 19:58:48] ⚠️ git pull失败，继续检查
[2026-03-23 19:58:48] guanyu 无新任务
management/tasks/pending/TASK-20260323195849.md
+7
View File
@@ -0,0 +1,7 @@
# 任务ID: TASK-20260323195849
# 状态: pending
# 负责人:
# 创建时间: Mon Mar 23 19:58:49 CST 2026
## 任务需求
持续压力测试 Mon Mar 23 19:58:49 CST 2026: 验证高并发下系统稳定性，测试git容错修复效果
zhaoyun_monitor.log
+21
View File
@@ -6207,3 +6207,24 @@ to recover.
[2026-03-23 19:58:17] ⚠️ git pull失败，继续检查
[2026-03-23 19:58:17] ⚠️ git pull失败，继续检查
[2026-03-23 19:58:17] 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 8f7b738a6169dcf85757dcc0b572c01d94f80473.
error: Unable to create '/Users/chufeng/.openclaw/agents/main/workspace/projects/sanguo_quant_live/.git/index.lock': File exists.
Another git process seems to be running in this repository, e.g.
an editor opened by 'git commit'. Please make sure all processes
are terminated then try again. If it still fails, a git process
may have crashed in this repository earlier:
remove the file manually to continue.
fatal: Cannot fast-forward your working tree.
After making sure that you saved anything precious from
$ git diff 8f7b738a6169dcf85757dcc0b572c01d94f80473
output, run
$ git reset --hard
to recover.
[2026-03-23 19:58:48] ⚠️ git pull失败，继续检查
[2026-03-23 19:58:48] ⚠️ git pull失败，继续检查
[2026-03-23 19:58:48] zhaoyun 无新任务