merge: accept remote fixes
This commit is contained in:
cfdaily
@@ -1413,3 +1413,444 @@
|
||||
[2026-03-23 09:37:31] guanyu 无新任务
|
||||
[2026-03-23 09:38:02] guanyu 无新任务
|
||||
[2026-03-23 09:38:32] guanyu 无新任务
|
||||
=========================================
|
||||
=========================================
|
||||
Agent监控启动 - guanyu
|
||||
Agent监控启动 - guanyu
|
||||
启动时间: 2026-03-23 14:47:58
|
||||
启动时间: 2026-03-23 14:47:58
|
||||
监控目录: management/agents/guanyu
|
||||
监控目录: management/agents/guanyu
|
||||
检查间隔: 30秒
|
||||
检查间隔: 30秒
|
||||
自动git pull: 每次检查前自动拉取
|
||||
自动git pull: 每次检查前自动拉取
|
||||
=========================================
|
||||
=========================================
|
||||
🚀 guanyu Agent监控器启动
|
||||
📊 监控目录: management/agents/guanyu
|
||||
📝 日志文件: guanyu_monitor.log
|
||||
⏰ 检查间隔: 30秒
|
||||
🔄 自动git pull: 每次检查前自动拉取
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:47:58] ✅ git pull成功
|
||||
[2026-03-23 14:47:58] ✅ git pull成功
|
||||
[2026-03-23 14:47:58] 🎯 guanyu 发现新任务: TASK-20260323133712
|
||||
[2026-03-23 14:47:58] 🎯 guanyu 发现新任务: TASK-20260323133712
|
||||
[2026-03-23 14:47:58] 📋 任务内容预览:
|
||||
# 任务ID: TASK-20260323133712
|
||||
# 状态: pending
|
||||
# 创建时间: Mon Mar 23 13:37:12 CST 2026
|
||||
|
||||
## 任务需求
|
||||
最终验证测试 - 关羽（风险都督）
|
||||
验证整条自动化链路：
|
||||
1. 诸葛亮创建任务 → 推送到Gitee
|
||||
2. 你的监控自动git pull → 发现.task文件
|
||||
3. 自动创建.done完成报告 → 自动git push回传结果
|
||||
rm 'management/agents/guanyu/TASK-20260323133712.task'
|
||||
[2026-03-23 14:47:58] ✅ guanyu 完成任务: TASK-20260323133712
|
||||
[2026-03-23 14:47:58] ✅ guanyu 完成任务: TASK-20260323133712
|
||||
[2026-03-23 14:47:58] 📝 完成标记已创建: management/agents/guanyu/TASK-20260323133712.done
|
||||
[2026-03-23 14:47:58] 📝 完成标记已创建: management/agents/guanyu/TASK-20260323133712.done
|
||||
fatal: pathspec 'management/agents/guanyu/TASK-20260323133712.task' did not match any files
|
||||
[2026-03-23 14:47:58] 📤 正在推送完成结果...
|
||||
[2026-03-23 14:47:58] 📤 正在推送完成结果...
|
||||
[main 3194dc5] auto: guanyu 完成任务 TASK-20260323133712
|
||||
1 file changed, 12 deletions(-)
|
||||
delete mode 100644 management/agents/guanyu/TASK-20260323133712.task
|
||||
remote: Powered by [01;33mGITEE.COM [0m[1.1.23]
|
||||
remote: Set trace flag 8a412980
|
||||
To gitee.com:cfdaily/sanguo_quant_live.git
|
||||
1ea364c..3194dc5 main -> main
|
||||
[2026-03-23 14:47:58] ✅ 推送成功！任务 TASK-20260323133712 完全完成
|
||||
[2026-03-23 14:47:58] ✅ 推送成功！任务 TASK-20260323133712 完全完成
|
||||
[2026-03-23 14:47:58] 🎯 guanyu 发现新任务: TASK-20260323142621
|
||||
[2026-03-23 14:47:58] 🎯 guanyu 发现新任务: TASK-20260323142621
|
||||
[2026-03-23 14:47:58] 📋 任务内容预览:
|
||||
# 任务ID: TASK-20260323142621
|
||||
# 状态: pending
|
||||
# 创建时间: Mon Mar 23 14:26:21 CST 2026
|
||||
|
||||
## 任务需求
|
||||
全员最终测试 - 关羽（风险都督）
|
||||
六位将军全员最终验证：
|
||||
验证完整全自动化链路
|
||||
现在所有人一起测试，验证多Agent并发处理
|
||||
你负责风控管理，验证通过后整个风控体系就就绪了。
|
||||
rm 'management/agents/guanyu/TASK-20260323142621.task'
|
||||
[2026-03-23 14:47:58] ✅ guanyu 完成任务: TASK-20260323142621
|
||||
[2026-03-23 14:47:58] ✅ guanyu 完成任务: TASK-20260323142621
|
||||
[2026-03-23 14:47:58] 📝 完成标记已创建: management/agents/guanyu/TASK-20260323142621.done
|
||||
[2026-03-23 14:47:58] 📝 完成标记已创建: management/agents/guanyu/TASK-20260323142621.done
|
||||
fatal: pathspec 'management/agents/guanyu/TASK-20260323142621.task' did not match any files
|
||||
[2026-03-23 14:47:58] 📤 正在推送完成结果...
|
||||
[2026-03-23 14:47:58] 📤 正在推送完成结果...
|
||||
[main 00a1e27] auto: guanyu 完成任务 TASK-20260323142621
|
||||
1 file changed, 12 deletions(-)
|
||||
delete mode 100644 management/agents/guanyu/TASK-20260323142621.task
|
||||
remote: Powered by [01;33mGITEE.COM [0m[1.1.23]
|
||||
remote: Set trace flag 8744e7b6
|
||||
To gitee.com:cfdaily/sanguo_quant_live.git
|
||||
3194dc5..00a1e27 main -> main
|
||||
[2026-03-23 14:47:58] ✅ 推送成功！任务 TASK-20260323142621 完全完成
|
||||
[2026-03-23 14:47:58] ✅ 推送成功！任务 TASK-20260323142621 完全完成
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:48:31] ✅ git pull成功
|
||||
[2026-03-23 14:48:31] ✅ git pull成功
|
||||
[2026-03-23 14:48:31] guanyu 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:49:02] ✅ git pull成功
|
||||
[2026-03-23 14:49:02] ✅ git pull成功
|
||||
[2026-03-23 14:49:02] guanyu 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:49:33] ✅ git pull成功
|
||||
[2026-03-23 14:49:33] ✅ git pull成功
|
||||
[2026-03-23 14:49:33] guanyu 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:50:04] ✅ git pull成功
|
||||
[2026-03-23 14:50:04] ✅ git pull成功
|
||||
[2026-03-23 14:50:04] guanyu 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:50:35] ✅ git pull成功
|
||||
[2026-03-23 14:50:35] ✅ git pull成功
|
||||
[2026-03-23 14:50:35] guanyu 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:51:06] ✅ git pull成功
|
||||
[2026-03-23 14:51:06] ✅ git pull成功
|
||||
[2026-03-23 14:51:06] guanyu 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:51:37] ✅ git pull成功
|
||||
[2026-03-23 14:51:37] ✅ git pull成功
|
||||
[2026-03-23 14:51:37] guanyu 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:52:08] ✅ git pull成功
|
||||
[2026-03-23 14:52:08] ✅ git pull成功
|
||||
[2026-03-23 14:52:08] guanyu 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:52:39] ✅ git pull成功
|
||||
[2026-03-23 14:52:39] ✅ git pull成功
|
||||
[2026-03-23 14:52:39] guanyu 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:53:10] ✅ git pull成功
|
||||
[2026-03-23 14:53:10] ✅ git pull成功
|
||||
[2026-03-23 14:53:10] guanyu 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:53:40] ✅ git pull成功
|
||||
[2026-03-23 14:53:40] ✅ git pull成功
|
||||
[2026-03-23 14:53:40] guanyu 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:54:11] ✅ git pull成功
|
||||
[2026-03-23 14:54:11] ✅ git pull成功
|
||||
[2026-03-23 14:54:11] guanyu 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:54:42] ✅ git pull成功
|
||||
[2026-03-23 14:54:42] ✅ git pull成功
|
||||
[2026-03-23 14:54:42] guanyu 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:55:13] ✅ git pull成功
|
||||
[2026-03-23 14:55:13] ✅ git pull成功
|
||||
[2026-03-23 14:55:13] guanyu 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:55:44] ✅ git pull成功
|
||||
[2026-03-23 14:55:44] ✅ git pull成功
|
||||
[2026-03-23 14:55:44] guanyu 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:56:15] ✅ git pull成功
|
||||
[2026-03-23 14:56:15] ✅ git pull成功
|
||||
[2026-03-23 14:56:15] guanyu 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
79f9058..add8c70 main -> origin/main
|
||||
error: Your local changes to the following files would be overwritten by merge:
|
||||
management/workflow/scripts/agent_monitor_fixed.sh
|
||||
Please commit your changes or stash them before you merge.
|
||||
Aborting
|
||||
Updating 79f9058..add8c70
|
||||
[2026-03-23 14:56:46] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 14:56:46] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 14:56:46] guanyu 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
error: Your local changes to the following files would be overwritten by merge:
|
||||
management/workflow/scripts/agent_monitor_fixed.sh
|
||||
Please commit your changes or stash them before you merge.
|
||||
Aborting
|
||||
Updating 79f9058..add8c70
|
||||
[2026-03-23 14:57:17] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 14:57:17] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 14:57:17] guanyu 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
error: Your local changes to the following files would be overwritten by merge:
|
||||
management/workflow/scripts/agent_monitor_fixed.sh
|
||||
Please commit your changes or stash them before you merge.
|
||||
Aborting
|
||||
Updating 79f9058..add8c70
|
||||
[2026-03-23 14:57:48] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 14:57:48] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 14:57:48] guanyu 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
error: Your local changes to the following files would be overwritten by merge:
|
||||
management/workflow/scripts/agent_monitor_fixed.sh
|
||||
Please commit your changes or stash them before you merge.
|
||||
Aborting
|
||||
Updating 79f9058..add8c70
|
||||
[2026-03-23 14:58:19] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 14:58:19] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 14:58:19] guanyu 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
error: Your local changes to the following files would be overwritten by merge:
|
||||
management/workflow/scripts/agent_monitor_fixed.sh
|
||||
Please commit your changes or stash them before you merge.
|
||||
Aborting
|
||||
Updating 79f9058..add8c70
|
||||
[2026-03-23 14:58:49] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 14:58:49] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 14:58:49] guanyu 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
error: Your local changes to the following files would be overwritten by merge:
|
||||
management/workflow/scripts/agent_monitor_fixed.sh
|
||||
Please commit your changes or stash them before you merge.
|
||||
Aborting
|
||||
Updating 79f9058..add8c70
|
||||
[2026-03-23 14:59:20] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 14:59:20] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 14:59:20] guanyu 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
error: Your local changes to the following files would be overwritten by merge:
|
||||
management/workflow/scripts/agent_monitor_fixed.sh
|
||||
Please commit your changes or stash them before you merge.
|
||||
Aborting
|
||||
Updating 79f9058..add8c70
|
||||
[2026-03-23 14:59:51] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 14:59:51] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 14:59:51] guanyu 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
error: Your local changes to the following files would be overwritten by merge:
|
||||
management/workflow/scripts/agent_monitor_fixed.sh
|
||||
Please commit your changes or stash them before you merge.
|
||||
Aborting
|
||||
Updating 79f9058..add8c70
|
||||
[2026-03-23 15:00:22] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:00:22] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:00:22] guanyu 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
error: Your local changes to the following files would be overwritten by merge:
|
||||
management/workflow/scripts/agent_monitor_fixed.sh
|
||||
Please commit your changes or stash them before you merge.
|
||||
Aborting
|
||||
Updating 79f9058..add8c70
|
||||
[2026-03-23 15:00:53] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:00:53] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:00:53] guanyu 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
error: Your local changes to the following files would be overwritten by merge:
|
||||
management/workflow/scripts/agent_monitor_fixed.sh
|
||||
Please commit your changes or stash them before you merge.
|
||||
Aborting
|
||||
Updating 79f9058..add8c70
|
||||
[2026-03-23 15:01:24] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:01:24] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:01:24] guanyu 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
error: Your local changes to the following files would be overwritten by merge:
|
||||
management/workflow/scripts/agent_monitor_fixed.sh
|
||||
Please commit your changes or stash them before you merge.
|
||||
Aborting
|
||||
Updating 79f9058..add8c70
|
||||
[2026-03-23 15:01:55] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:01:55] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:01:55] guanyu 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
error: Your local changes to the following files would be overwritten by merge:
|
||||
management/workflow/scripts/agent_monitor_fixed.sh
|
||||
Please commit your changes or stash them before you merge.
|
||||
Aborting
|
||||
Updating 79f9058..add8c70
|
||||
[2026-03-23 15:02:26] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:02:26] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:02:26] guanyu 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
error: Your local changes to the following files would be overwritten by merge:
|
||||
management/workflow/scripts/agent_monitor_fixed.sh
|
||||
Please commit your changes or stash them before you merge.
|
||||
Aborting
|
||||
Updating 79f9058..add8c70
|
||||
[2026-03-23 15:02:57] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:02:57] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:02:57] guanyu 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
error: Your local changes to the following files would be overwritten by merge:
|
||||
management/workflow/scripts/agent_monitor_fixed.sh
|
||||
Please commit your changes or stash them before you merge.
|
||||
Aborting
|
||||
Updating 79f9058..add8c70
|
||||
[2026-03-23 15:03:28] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:03:28] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:03:28] guanyu 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
error: Your local changes to the following files would be overwritten by merge:
|
||||
management/workflow/scripts/agent_monitor_fixed.sh
|
||||
Please commit your changes or stash them before you merge.
|
||||
Aborting
|
||||
Updating 79f9058..add8c70
|
||||
[2026-03-23 15:03:59] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:03:59] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:03:59] guanyu 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
error: Your local changes to the following files would be overwritten by merge:
|
||||
management/workflow/scripts/agent_monitor_fixed.sh
|
||||
Please commit your changes or stash them before you merge.
|
||||
Aborting
|
||||
Updating 79f9058..add8c70
|
||||
[2026-03-23 15:04:30] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:04:30] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:04:30] guanyu 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
error: Your local changes to the following files would be overwritten by merge:
|
||||
management/workflow/scripts/agent_monitor_fixed.sh
|
||||
Please commit your changes or stash them before you merge.
|
||||
Aborting
|
||||
Updating 79f9058..add8c70
|
||||
[2026-03-23 15:05:01] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:05:01] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:05:01] guanyu 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
error: Your local changes to the following files would be overwritten by merge:
|
||||
management/workflow/scripts/agent_monitor_fixed.sh
|
||||
Please commit your changes or stash them before you merge.
|
||||
Aborting
|
||||
Updating 79f9058..add8c70
|
||||
[2026-03-23 15:05:31] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:05:31] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:05:31] guanyu 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
error: Your local changes to the following files would be overwritten by merge:
|
||||
management/workflow/scripts/agent_monitor_fixed.sh
|
||||
Please commit your changes or stash them before you merge.
|
||||
Aborting
|
||||
Updating 79f9058..add8c70
|
||||
[2026-03-23 15:06:02] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:06:02] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:06:02] guanyu 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
error: Your local changes to the following files would be overwritten by merge:
|
||||
management/workflow/scripts/agent_monitor_fixed.sh
|
||||
Please commit your changes or stash them before you merge.
|
||||
Aborting
|
||||
Updating 79f9058..add8c70
|
||||
[2026-03-23 15:06:33] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:06:33] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:06:33] guanyu 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
error: Your local changes to the following files would be overwritten by merge:
|
||||
management/workflow/scripts/agent_monitor_fixed.sh
|
||||
Please commit your changes or stash them before you merge.
|
||||
Aborting
|
||||
Updating 79f9058..add8c70
|
||||
[2026-03-23 15:07:04] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:07:04] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:07:04] guanyu 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
error: Your local changes to the following files would be overwritten by merge:
|
||||
management/workflow/scripts/agent_monitor_fixed.sh
|
||||
Please commit your changes or stash them before you merge.
|
||||
Aborting
|
||||
Updating 79f9058..add8c70
|
||||
[2026-03-23 15:07:35] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:07:35] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:07:35] guanyu 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
error: Your local changes to the following files would be overwritten by merge:
|
||||
management/workflow/scripts/agent_monitor_fixed.sh
|
||||
Please commit your changes or stash them before you merge.
|
||||
Aborting
|
||||
Updating 79f9058..add8c70
|
||||
[2026-03-23 15:08:06] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:08:06] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:08:06] guanyu 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
error: Your local changes to the following files would be overwritten by merge:
|
||||
management/workflow/scripts/agent_monitor_fixed.sh
|
||||
Please commit your changes or stash them before you merge.
|
||||
Aborting
|
||||
Updating 79f9058..add8c70
|
||||
[2026-03-23 15:08:37] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:08:37] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:08:37] guanyu 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
error: Your local changes to the following files would be overwritten by merge:
|
||||
management/workflow/scripts/agent_monitor_fixed.sh
|
||||
Please commit your changes or stash them before you merge.
|
||||
Aborting
|
||||
Updating 79f9058..add8c70
|
||||
[2026-03-23 15:09:08] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:09:08] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:09:08] guanyu 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
error: Your local changes to the following files would be overwritten by merge:
|
||||
management/workflow/scripts/agent_monitor_fixed.sh
|
||||
Please commit your changes or stash them before you merge.
|
||||
Aborting
|
||||
Updating 79f9058..add8c70
|
||||
[2026-03-23 15:09:39] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:09:39] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:09:39] guanyu 无新任务
|
||||
|
||||
Reference in New Issue
Block a user