sync: 自动同步未提交变更 [assign TASK-20260323175132 to guanyu]
This commit is contained in:
@@ -2794,3 +2794,88 @@ to recover.
|
||||
To gitee.com:cfdaily/sanguo_quant_live.git
|
||||
a955417..aa12cd2 main -> main
|
||||
[2026-03-23 17:50:59] ✅ 推送成功!任务 TASK-20260323175053 完全完成
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
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 8c84462332f2ef0a804e60a38f3112f2683eecef.
|
||||
error: Your local changes to the following files would be overwritten by merge:
|
||||
simayi_monitor.log
|
||||
zhangfei_monitor.log
|
||||
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/agents/simayi/TASK-20260323175115.done
|
||||
management/agents/zhaoyun/TASK-20260323175100.done
|
||||
management/agents/zhaoyun/TASK-20260323175118.done
|
||||
management/tasks/pending/TASK-20260323175132.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 8c84462332f2ef0a804e60a38f3112f2683eecef
|
||||
output, run
|
||||
$ git reset --hard
|
||||
to recover.
|
||||
[2026-03-23 17:51:31] ⚠️ git pull失败,继续检查
|
||||
[2026-03-23 17:51:31] 🎯 jiangwei 发现新任务: TASK-20260323175106
|
||||
[2026-03-23 17:51:31] 📋 任务内容预览:
|
||||
# 任务ID: TASK-20260323175106
|
||||
# 状态: pending
|
||||
# 创建时间: Mon Mar 23 17:51:06 CST 2026
|
||||
|
||||
## 任务需求
|
||||
压力测试任务 9: 验证系统在多任务情况下的稳定性,检查工作流各环节是否正常工作
|
||||
warning: fetch updated the current branch head.
|
||||
fast-forwarding your working tree from
|
||||
commit 8c84462332f2ef0a804e60a38f3112f2683eecef.
|
||||
error: Your local changes to the following files would be overwritten by merge:
|
||||
simayi_monitor.log
|
||||
zhangfei_monitor.log
|
||||
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/agents/simayi/TASK-20260323175115.done
|
||||
management/agents/zhaoyun/TASK-20260323175100.done
|
||||
management/agents/zhaoyun/TASK-20260323175118.done
|
||||
management/tasks/pending/TASK-20260323175132.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 8c84462332f2ef0a804e60a38f3112f2683eecef
|
||||
output, run
|
||||
$ git reset --hard
|
||||
to recover.
|
||||
[2026-03-23 17:51:31] ⚠️ git pull失败,继续检查
|
||||
[2026-03-23 17:51:31] 🎯 jiangwei 发现新任务: TASK-20260323175120
|
||||
[2026-03-23 17:51:31] 📋 任务内容预览:
|
||||
# 任务ID: TASK-20260323175120
|
||||
# 状态: pending
|
||||
# 创建时间: Mon Mar 23 17:51:20 CST 2026
|
||||
|
||||
## 任务需求
|
||||
压力测试任务 14: 验证系统在多任务情况下的稳定性,检查工作流各环节是否正常工作
|
||||
rm 'management/agents/jiangwei/TASK-20260323175106.task'
|
||||
[2026-03-23 17:51:31] ✅ jiangwei 完成任务: TASK-20260323175106
|
||||
[2026-03-23 17:51:31] 📝 完成标记已创建: management/agents/jiangwei/TASK-20260323175106.done
|
||||
fatal: pathspec 'management/agents/jiangwei/TASK-20260323175106.task' did not match any files
|
||||
rm 'management/agents/jiangwei/TASK-20260323175120.task'
|
||||
[2026-03-23 17:51:31] ✅ jiangwei 完成任务: TASK-20260323175120
|
||||
[2026-03-23 17:51:31] 📝 完成标记已创建: management/agents/jiangwei/TASK-20260323175120.done
|
||||
fatal: pathspec 'management/agents/jiangwei/TASK-20260323175120.task' did not match any files
|
||||
[2026-03-23 17:51:31] 📤 正在推送完成结果...
|
||||
fatal: 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.
|
||||
[2026-03-23 17:51:31] 📤 正在推送完成结果...
|
||||
[main f216a1f] auto: jiangwei 完成任务 TASK-20260323175120
|
||||
2 files changed, 12 deletions(-)
|
||||
delete mode 100644 management/agents/jiangwei/TASK-20260323175106.task
|
||||
delete mode 100644 management/agents/jiangwei/TASK-20260323175120.task
|
||||
|
||||
Reference in New Issue
Block a user