merge: accept remote fixes
This commit is contained in:
cfdaily
@@ -80,3 +80,443 @@ yi
|
||||
[2026-03-23 01:06:50] simayi 无新任务
|
||||
[2026-03-23 01:07:20] simayi 无新任务
|
||||
[2026-03-23 01:07:50] simayi 无新任务
|
||||
=========================================
|
||||
=========================================
|
||||
Agent监控启动 - simayi
|
||||
Agent监控启动 - simayi
|
||||
启动时间: 2026-03-23 14:48:06
|
||||
启动时间: 2026-03-23 14:48:06
|
||||
监控目录: management/agents/simayi
|
||||
监控目录: management/agents/simayi
|
||||
检查间隔: 30秒
|
||||
检查间隔: 30秒
|
||||
自动git pull: 每次检查前自动拉取
|
||||
自动git pull: 每次检查前自动拉取
|
||||
=========================================
|
||||
=========================================
|
||||
🚀 simayi Agent监控器启动
|
||||
📊 监控目录: management/agents/simayi
|
||||
📝 日志文件: simayi_monitor.log
|
||||
⏰ 检查间隔: 30秒
|
||||
🔄 自动git pull: 每次检查前自动拉取
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:48:06] ✅ git pull成功
|
||||
[2026-03-23 14:48:06] ✅ git pull成功
|
||||
[2026-03-23 14:48:06] 🎯 simayi 发现新任务: TASK-20260323133817
|
||||
[2026-03-23 14:48:06] 🎯 simayi 发现新任务: TASK-20260323133817
|
||||
[2026-03-23 14:48:06] 📋 任务内容预览:
|
||||
# 任务ID: TASK-20260323133817
|
||||
# 状态: pending
|
||||
# 创建时间: Mon Mar 23 13:38:18 CST 2026
|
||||
|
||||
## 任务需求
|
||||
最终验证测试 - 司马懿（质量总监）
|
||||
验证整条自动化任务分发链路：
|
||||
1. 任务创建 → Gitee
|
||||
2. 自动git pull → 发现任务
|
||||
3. 自动创建.done → 自动push回传
|
||||
rm 'management/agents/simayi/TASK-20260323133817.task'
|
||||
[2026-03-23 14:48:06] ✅ simayi 完成任务: TASK-20260323133817
|
||||
[2026-03-23 14:48:06] ✅ simayi 完成任务: TASK-20260323133817
|
||||
[2026-03-23 14:48:06] 📝 完成标记已创建: management/agents/simayi/TASK-20260323133817.done
|
||||
[2026-03-23 14:48:06] 📝 完成标记已创建: management/agents/simayi/TASK-20260323133817.done
|
||||
fatal: pathspec 'management/agents/simayi/TASK-20260323133817.task' did not match any files
|
||||
[2026-03-23 14:48:06] 📤 正在推送完成结果...
|
||||
[2026-03-23 14:48:06] 📤 正在推送完成结果...
|
||||
[main ea7c14f] auto: simayi 完成任务 TASK-20260323133817
|
||||
1 file changed, 13 deletions(-)
|
||||
delete mode 100644 management/agents/simayi/TASK-20260323133817.task
|
||||
remote: Powered by [01;33mGITEE.COM [0m[1.1.23]
|
||||
remote: Set trace flag 514b7383
|
||||
To gitee.com:cfdaily/sanguo_quant_live.git
|
||||
85aa1c0..ea7c14f main -> main
|
||||
[2026-03-23 14:48:06] ✅ 推送成功！任务 TASK-20260323133817 完全完成
|
||||
[2026-03-23 14:48:06] ✅ 推送成功！任务 TASK-20260323133817 完全完成
|
||||
[2026-03-23 14:48:06] 🎯 simayi 发现新任务: TASK-20260323142641
|
||||
[2026-03-23 14:48:06] 🎯 simayi 发现新任务: TASK-20260323142641
|
||||
[2026-03-23 14:48:06] 📋 任务内容预览:
|
||||
# 任务ID: TASK-20260323142641
|
||||
# 状态: pending
|
||||
# 创建时间: Mon Mar 23 14:26:41 CST 2026
|
||||
|
||||
## 任务需求
|
||||
全员最终测试 - 司马懿（质量总监）
|
||||
六位将军全员最终验证：
|
||||
验证完整的全自动化任务分发流程
|
||||
现在全员并发测试，验证系统稳定性
|
||||
你负责质量保障，验证通过后整个质量体系就就绪了。
|
||||
rm 'management/agents/simayi/TASK-20260323142641.task'
|
||||
[2026-03-23 14:48:06] ✅ simayi 完成任务: TASK-20260323142641
|
||||
[2026-03-23 14:48:06] ✅ simayi 完成任务: TASK-20260323142641
|
||||
[2026-03-23 14:48:06] 📝 完成标记已创建: management/agents/simayi/TASK-20260323142641.done
|
||||
[2026-03-23 14:48:06] 📝 完成标记已创建: management/agents/simayi/TASK-20260323142641.done
|
||||
fatal: pathspec 'management/agents/simayi/TASK-20260323142641.task' did not match any files
|
||||
[2026-03-23 14:48:06] 📤 正在推送完成结果...
|
||||
[2026-03-23 14:48:06] 📤 正在推送完成结果...
|
||||
[main 79f9058] auto: simayi 完成任务 TASK-20260323142641
|
||||
1 file changed, 12 deletions(-)
|
||||
delete mode 100644 management/agents/simayi/TASK-20260323142641.task
|
||||
remote: Powered by [01;33mGITEE.COM [0m[1.1.23]
|
||||
remote: Set trace flag c64d44ba
|
||||
To gitee.com:cfdaily/sanguo_quant_live.git
|
||||
ea7c14f..79f9058 main -> main
|
||||
[2026-03-23 14:48:06] ✅ 推送成功！任务 TASK-20260323142641 完全完成
|
||||
[2026-03-23 14:48:06] ✅ 推送成功！任务 TASK-20260323142641 完全完成
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:48:40] ✅ git pull成功
|
||||
[2026-03-23 14:48:40] ✅ git pull成功
|
||||
[2026-03-23 14:48:40] simayi 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:49:11] ✅ git pull成功
|
||||
[2026-03-23 14:49:11] ✅ git pull成功
|
||||
[2026-03-23 14:49:11] simayi 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:49:42] ✅ git pull成功
|
||||
[2026-03-23 14:49:42] ✅ git pull成功
|
||||
[2026-03-23 14:49:42] simayi 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:50:13] ✅ git pull成功
|
||||
[2026-03-23 14:50:13] ✅ git pull成功
|
||||
[2026-03-23 14:50:13] simayi 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:50:44] ✅ git pull成功
|
||||
[2026-03-23 14:50:44] ✅ git pull成功
|
||||
[2026-03-23 14:50:44] simayi 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:51:15] ✅ git pull成功
|
||||
[2026-03-23 14:51:15] ✅ git pull成功
|
||||
[2026-03-23 14:51:15] simayi 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:51:46] ✅ git pull成功
|
||||
[2026-03-23 14:51:46] ✅ git pull成功
|
||||
[2026-03-23 14:51:46] simayi 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:52:17] ✅ git pull成功
|
||||
[2026-03-23 14:52:17] ✅ git pull成功
|
||||
[2026-03-23 14:52:17] simayi 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:52:48] ✅ git pull成功
|
||||
[2026-03-23 14:52:48] ✅ git pull成功
|
||||
[2026-03-23 14:52:48] simayi 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:53:18] ✅ git pull成功
|
||||
[2026-03-23 14:53:18] ✅ git pull成功
|
||||
[2026-03-23 14:53:18] simayi 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:53:49] ✅ git pull成功
|
||||
[2026-03-23 14:53:49] ✅ git pull成功
|
||||
[2026-03-23 14:53:49] simayi 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:54:20] ✅ git pull成功
|
||||
[2026-03-23 14:54:20] ✅ git pull成功
|
||||
[2026-03-23 14:54:20] simayi 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:54:51] ✅ git pull成功
|
||||
[2026-03-23 14:54:51] ✅ git pull成功
|
||||
[2026-03-23 14:54:51] simayi 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:55:22] ✅ git pull成功
|
||||
[2026-03-23 14:55:22] ✅ git pull成功
|
||||
[2026-03-23 14:55:22] simayi 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:55:53] ✅ git pull成功
|
||||
[2026-03-23 14:55:53] ✅ git pull成功
|
||||
[2026-03-23 14:55:53] simayi 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:56:24] ✅ git pull成功
|
||||
[2026-03-23 14:56:24] ✅ git pull成功
|
||||
[2026-03-23 14:56:24] simayi 无新任务
|
||||
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:56:55] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 14:56:55] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 14:56:55] simayi 无新任务
|
||||
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:26] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 14:57:26] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 14:57:26] simayi 无新任务
|
||||
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:56] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 14:57:56] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 14:57:56] simayi 无新任务
|
||||
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:27] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 14:58:27] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 14:58:27] simayi 无新任务
|
||||
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:58] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 14:58:58] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 14:58:58] simayi 无新任务
|
||||
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:29] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 14:59:29] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 14:59:29] simayi 无新任务
|
||||
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:00] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:00:00] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:00:00] simayi 无新任务
|
||||
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:31] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:00:31] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:00:31] simayi 无新任务
|
||||
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:02] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:01:02] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:01:02] simayi 无新任务
|
||||
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:33] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:01:33] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:01:33] simayi 无新任务
|
||||
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:04] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:02:04] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:02:04] simayi 无新任务
|
||||
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:35] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:02:35] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:02:35] simayi 无新任务
|
||||
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:06] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:03:06] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:03:06] simayi 无新任务
|
||||
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:37] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:03:37] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:03:37] simayi 无新任务
|
||||
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:08] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:04:08] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:04:08] simayi 无新任务
|
||||
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:39] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:04:39] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:04:39] simayi 无新任务
|
||||
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:10] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:05:10] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:05:10] simayi 无新任务
|
||||
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:41] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:05:41] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:05:41] simayi 无新任务
|
||||
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:11] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:06:11] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:06:11] simayi 无新任务
|
||||
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:42] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:06:42] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:06:42] simayi 无新任务
|
||||
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:13] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:07:13] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:07:13] simayi 无新任务
|
||||
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:44] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:07:44] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:07:44] simayi 无新任务
|
||||
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:15] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:08:15] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:08:15] simayi 无新任务
|
||||
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:46] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:08:46] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:08:46] simayi 无新任务
|
||||
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:17] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:09:17] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:09:17] simayi 无新任务
|
||||
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:48] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:09:48] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:09:48] simayi 无新任务
|
||||
|
||||
Reference in New Issue
Block a user