merge: accept remote fixes
This commit is contained in:
cfdaily
@@ -1415,3 +1415,413 @@
|
||||
[2026-03-23 09:37:53] zhaoyun 无新任务
|
||||
[2026-03-23 09:38:23] zhaoyun 无新任务
|
||||
[2026-03-23 09:38:53] zhaoyun 无新任务
|
||||
=========================================
|
||||
=========================================
|
||||
Agent监控启动 - zhaoyun
|
||||
Agent监控启动 - zhaoyun
|
||||
启动时间: 2026-03-23 14:48:02
|
||||
启动时间: 2026-03-23 14:48:02
|
||||
监控目录: management/agents/zhaoyun
|
||||
监控目录: management/agents/zhaoyun
|
||||
检查间隔: 30秒
|
||||
检查间隔: 30秒
|
||||
自动git pull: 每次检查前自动拉取
|
||||
自动git pull: 每次检查前自动拉取
|
||||
=========================================
|
||||
=========================================
|
||||
🚀 zhaoyun Agent监控器启动
|
||||
📊 监控目录: management/agents/zhaoyun
|
||||
📝 日志文件: zhaoyun_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:02] ✅ git pull成功
|
||||
[2026-03-23 14:48:02] ✅ git pull成功
|
||||
[2026-03-23 14:48:02] 🎯 zhaoyun 发现新任务: TASK-20260323142455
|
||||
[2026-03-23 14:48:02] 🎯 zhaoyun 发现新任务: TASK-20260323142455
|
||||
[2026-03-23 14:48:02] 📋 任务内容预览:
|
||||
# 任务ID: TASK-20260323142455
|
||||
# 状态: pending
|
||||
# 创建时间: Mon Mar 23 14:24:55 CST 2026
|
||||
|
||||
## 任务需求
|
||||
最终验证测试 - 赵云（数据护军）
|
||||
验证整条自动化任务分发链路：
|
||||
1. 诸葛亮创建任务 → 推送到Gitee
|
||||
2. 监控自动git pull → 发现任务
|
||||
3. 自动创建.done完成报告 → 自动git push回传结果
|
||||
rm 'management/agents/zhaoyun/TASK-20260323142455.task'
|
||||
[2026-03-23 14:48:02] ✅ zhaoyun 完成任务: TASK-20260323142455
|
||||
[2026-03-23 14:48:02] ✅ zhaoyun 完成任务: TASK-20260323142455
|
||||
[2026-03-23 14:48:02] 📝 完成标记已创建: management/agents/zhaoyun/TASK-20260323142455.done
|
||||
[2026-03-23 14:48:02] 📝 完成标记已创建: management/agents/zhaoyun/TASK-20260323142455.done
|
||||
fatal: pathspec 'management/agents/zhaoyun/TASK-20260323142455.task' did not match any files
|
||||
[2026-03-23 14:48:02] 📤 正在推送完成结果...
|
||||
[2026-03-23 14:48:02] 📤 正在推送完成结果...
|
||||
[main 85aa1c0] auto: zhaoyun 完成任务 TASK-20260323142455
|
||||
1 file changed, 13 deletions(-)
|
||||
delete mode 100644 management/agents/zhaoyun/TASK-20260323142455.task
|
||||
remote: Powered by [01;33mGITEE.COM [0m[1.1.23]
|
||||
remote: Set trace flag 5a4c858a
|
||||
To gitee.com:cfdaily/sanguo_quant_live.git
|
||||
00a1e27..85aa1c0 main -> main
|
||||
[2026-03-23 14:48:02] ✅ 推送成功！任务 TASK-20260323142455 完全完成
|
||||
[2026-03-23 14:48:02] ✅ 推送成功！任务 TASK-20260323142455 完全完成
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:48:35] ✅ git pull成功
|
||||
[2026-03-23 14:48:35] ✅ git pull成功
|
||||
[2026-03-23 14:48:35] zhaoyun 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:49:06] ✅ git pull成功
|
||||
[2026-03-23 14:49:06] ✅ git pull成功
|
||||
[2026-03-23 14:49:06] zhaoyun 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:49:37] ✅ git pull成功
|
||||
[2026-03-23 14:49:37] ✅ git pull成功
|
||||
[2026-03-23 14:49:37] zhaoyun 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:50:08] ✅ git pull成功
|
||||
[2026-03-23 14:50:08] ✅ git pull成功
|
||||
[2026-03-23 14:50:08] zhaoyun 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:50:39] ✅ git pull成功
|
||||
[2026-03-23 14:50:39] ✅ git pull成功
|
||||
[2026-03-23 14:50:39] zhaoyun 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:51:10] ✅ git pull成功
|
||||
[2026-03-23 14:51:10] ✅ git pull成功
|
||||
[2026-03-23 14:51:10] zhaoyun 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:51:41] ✅ git pull成功
|
||||
[2026-03-23 14:51:41] ✅ git pull成功
|
||||
[2026-03-23 14:51:41] zhaoyun 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:52:12] ✅ git pull成功
|
||||
[2026-03-23 14:52:12] ✅ git pull成功
|
||||
[2026-03-23 14:52:12] zhaoyun 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:52:43] ✅ git pull成功
|
||||
[2026-03-23 14:52:43] ✅ git pull成功
|
||||
[2026-03-23 14:52:43] zhaoyun 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:53:14] ✅ git pull成功
|
||||
[2026-03-23 14:53:14] ✅ git pull成功
|
||||
[2026-03-23 14:53:14] zhaoyun 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:53:44] ✅ git pull成功
|
||||
[2026-03-23 14:53:44] ✅ git pull成功
|
||||
[2026-03-23 14:53:44] zhaoyun 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:54:15] ✅ git pull成功
|
||||
[2026-03-23 14:54:15] ✅ git pull成功
|
||||
[2026-03-23 14:54:15] zhaoyun 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:54:46] ✅ git pull成功
|
||||
[2026-03-23 14:54:46] ✅ git pull成功
|
||||
[2026-03-23 14:54:46] zhaoyun 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:55:17] ✅ git pull成功
|
||||
[2026-03-23 14:55:17] ✅ git pull成功
|
||||
[2026-03-23 14:55:17] zhaoyun 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:55:48] ✅ git pull成功
|
||||
[2026-03-23 14:55:48] ✅ git pull成功
|
||||
[2026-03-23 14:55:48] zhaoyun 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:56:19] ✅ git pull成功
|
||||
[2026-03-23 14:56:19] ✅ git pull成功
|
||||
[2026-03-23 14:56:19] zhaoyun 无新任务
|
||||
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:50] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 14:56:50] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 14:56:50] zhaoyun 无新任务
|
||||
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:21] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 14:57:21] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 14:57:21] zhaoyun 无新任务
|
||||
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:52] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 14:57:52] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 14:57:52] zhaoyun 无新任务
|
||||
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:23] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 14:58:23] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 14:58:23] zhaoyun 无新任务
|
||||
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:54] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 14:58:54] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 14:58:54] zhaoyun 无新任务
|
||||
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:25] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 14:59:25] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 14:59:25] zhaoyun 无新任务
|
||||
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:56] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 14:59:56] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 14:59:56] zhaoyun 无新任务
|
||||
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:26] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:00:26] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:00:26] zhaoyun 无新任务
|
||||
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:57] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:00:57] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:00:57] zhaoyun 无新任务
|
||||
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:28] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:01:28] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:01:28] zhaoyun 无新任务
|
||||
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:59] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:01:59] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:01:59] zhaoyun 无新任务
|
||||
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:30] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:02:30] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:02:30] zhaoyun 无新任务
|
||||
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:01] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:03:01] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:03:01] zhaoyun 无新任务
|
||||
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:32] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:03:32] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:03:32] zhaoyun 无新任务
|
||||
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:03] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:04:03] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:04:03] zhaoyun 无新任务
|
||||
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:34] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:04:34] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:04:34] zhaoyun 无新任务
|
||||
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:05] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:05:05] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:05:05] zhaoyun 无新任务
|
||||
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:35] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:05:35] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:05:35] zhaoyun 无新任务
|
||||
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:06] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:06:06] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:06:06] zhaoyun 无新任务
|
||||
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:37] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:06:37] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:06:37] zhaoyun 无新任务
|
||||
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:08] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:07:08] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:07:08] zhaoyun 无新任务
|
||||
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:39] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:07:39] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:07:39] zhaoyun 无新任务
|
||||
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:10] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:08:10] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:08:10] zhaoyun 无新任务
|
||||
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:41] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:08:41] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:08:41] zhaoyun 无新任务
|
||||
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:12] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:09:12] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:09:12] zhaoyun 无新任务
|
||||
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:43] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:09:43] ⚠️ git pull失败，继续检查
|
||||
[2026-03-23 15:09:43] zhaoyun 无新任务
|
||||
|
||||
Reference in New Issue
Block a user