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