merge: accept remote fixes
This commit is contained in:
@@ -123,3 +123,973 @@ From gitee.com:cfdaily/sanguo_quant_live
|
||||
Already up to date.
|
||||
[2026-03-23 14:02:43] ✅ git pull成功
|
||||
[2026-03-23 14:02:43] jiangwei 无新任务
|
||||
=========================================
|
||||
=========================================
|
||||
Agent监控启动 - jiangwei
|
||||
Agent监控启动 - jiangwei
|
||||
启动时间: 2026-03-23 14:05:40
|
||||
启动时间: 2026-03-23 14:05:40
|
||||
监控目录: management/agents/jiangwei
|
||||
监控目录: management/agents/jiangwei
|
||||
检查间隔: 30秒
|
||||
检查间隔: 30秒
|
||||
自动git pull: 每次检查前自动拉取
|
||||
自动git pull: 每次检查前自动拉取
|
||||
=========================================
|
||||
=========================================
|
||||
🚀 jiangwei Agent监控器启动
|
||||
📊 监控目录: management/agents/jiangwei
|
||||
📝 日志文件: jiangwei_monitor.log
|
||||
⏰ 检查间隔: 30秒
|
||||
🔄 自动git pull: 每次检查前自动拉取
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:05:40] ✅ git pull成功
|
||||
[2026-03-23 14:05:40] ✅ git pull成功
|
||||
[2026-03-23 14:05:40] jiangwei 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:06:11] ✅ git pull成功
|
||||
[2026-03-23 14:06:11] ✅ git pull成功
|
||||
[2026-03-23 14:06:11] jiangwei 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:06:42] ✅ git pull成功
|
||||
[2026-03-23 14:06:42] ✅ git pull成功
|
||||
[2026-03-23 14:06:42] jiangwei 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:07:13] ✅ git pull成功
|
||||
[2026-03-23 14:07:13] ✅ git pull成功
|
||||
[2026-03-23 14:07:13] jiangwei 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:07:44] ✅ git pull成功
|
||||
[2026-03-23 14:07:44] ✅ git pull成功
|
||||
[2026-03-23 14:07:44] jiangwei 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:08:15] ✅ git pull成功
|
||||
[2026-03-23 14:08:15] ✅ git pull成功
|
||||
[2026-03-23 14:08:15] jiangwei 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:08:46] ✅ git pull成功
|
||||
[2026-03-23 14:08:46] ✅ git pull成功
|
||||
[2026-03-23 14:08:46] jiangwei 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:09:17] ✅ git pull成功
|
||||
[2026-03-23 14:09:17] ✅ git pull成功
|
||||
[2026-03-23 14:09:17] jiangwei 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:09:48] ✅ git pull成功
|
||||
[2026-03-23 14:09:48] ✅ git pull成功
|
||||
[2026-03-23 14:09:48] jiangwei 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:10:19] ✅ git pull成功
|
||||
[2026-03-23 14:10:19] ✅ git pull成功
|
||||
[2026-03-23 14:10:19] jiangwei 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:10:50] ✅ git pull成功
|
||||
[2026-03-23 14:10:50] ✅ git pull成功
|
||||
[2026-03-23 14:10:50] jiangwei 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:11:21] ✅ git pull成功
|
||||
[2026-03-23 14:11:21] ✅ git pull成功
|
||||
[2026-03-23 14:11:21] jiangwei 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:11:52] ✅ git pull成功
|
||||
[2026-03-23 14:11:52] ✅ git pull成功
|
||||
[2026-03-23 14:11:52] jiangwei 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:12:23] ✅ git pull成功
|
||||
[2026-03-23 14:12:23] ✅ git pull成功
|
||||
[2026-03-23 14:12:23] jiangwei 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:12:54] ✅ git pull成功
|
||||
[2026-03-23 14:12:54] ✅ git pull成功
|
||||
[2026-03-23 14:12:54] jiangwei 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:13:25] ✅ git pull成功
|
||||
[2026-03-23 14:13:25] ✅ git pull成功
|
||||
[2026-03-23 14:13:25] jiangwei 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:13:56] ✅ git pull成功
|
||||
[2026-03-23 14:13:56] ✅ git pull成功
|
||||
[2026-03-23 14:13:56] jiangwei 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:14:27] ✅ git pull成功
|
||||
[2026-03-23 14:14:27] ✅ git pull成功
|
||||
[2026-03-23 14:14:27] jiangwei 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:14:58] ✅ git pull成功
|
||||
[2026-03-23 14:14:58] ✅ git pull成功
|
||||
[2026-03-23 14:14:58] jiangwei 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:15:29] ✅ git pull成功
|
||||
[2026-03-23 14:15:29] ✅ git pull成功
|
||||
[2026-03-23 14:15:29] jiangwei 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:16:00] ✅ git pull成功
|
||||
[2026-03-23 14:16:00] ✅ git pull成功
|
||||
[2026-03-23 14:16:00] jiangwei 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:16:31] ✅ git pull成功
|
||||
[2026-03-23 14:16:31] ✅ git pull成功
|
||||
[2026-03-23 14:16:31] jiangwei 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:17:02] ✅ git pull成功
|
||||
[2026-03-23 14:17:02] ✅ git pull成功
|
||||
[2026-03-23 14:17:02] jiangwei 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:17:33] ✅ git pull成功
|
||||
[2026-03-23 14:17:33] ✅ git pull成功
|
||||
[2026-03-23 14:17:33] jiangwei 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:18:04] ✅ git pull成功
|
||||
[2026-03-23 14:18:04] ✅ git pull成功
|
||||
[2026-03-23 14:18:04] jiangwei 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:18:35] ✅ git pull成功
|
||||
[2026-03-23 14:18:35] ✅ git pull成功
|
||||
[2026-03-23 14:18:35] jiangwei 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:19:06] ✅ git pull成功
|
||||
[2026-03-23 14:19:06] ✅ git pull成功
|
||||
[2026-03-23 14:19:06] jiangwei 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:19:37] ✅ git pull成功
|
||||
[2026-03-23 14:19:37] ✅ git pull成功
|
||||
[2026-03-23 14:19:37] jiangwei 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:20:08] ✅ git pull成功
|
||||
[2026-03-23 14:20:08] ✅ git pull成功
|
||||
[2026-03-23 14:20:08] jiangwei 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:20:39] ✅ git pull成功
|
||||
[2026-03-23 14:20:39] ✅ git pull成功
|
||||
[2026-03-23 14:20:39] jiangwei 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:21:10] ✅ git pull成功
|
||||
[2026-03-23 14:21:10] ✅ git pull成功
|
||||
[2026-03-23 14:21:10] jiangwei 无新任务
|
||||
=========================================
|
||||
=========================================
|
||||
Agent监控启动 - jiangwei
|
||||
Agent监控启动 - jiangwei
|
||||
启动时间: 2026-03-23 14:21:35
|
||||
启动时间: 2026-03-23 14:21:35
|
||||
监控目录: management/agents/jiangwei
|
||||
监控目录: management/agents/jiangwei
|
||||
检查间隔: 30秒
|
||||
检查间隔: 30秒
|
||||
自动git pull: 每次检查前自动拉取
|
||||
自动git pull: 每次检查前自动拉取
|
||||
=========================================
|
||||
=========================================
|
||||
🚀 jiangwei Agent监控器启动
|
||||
📊 监控目录: management/agents/jiangwei
|
||||
📝 日志文件: jiangwei_monitor.log
|
||||
⏰ 检查间隔: 30秒
|
||||
🔄 自动git pull: 每次检查前自动拉取
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
There are no candidates for merging among the refs that you just fetched.
|
||||
Generally this means that you provided a wildcard refspec which had no
|
||||
matches on the remote end.
|
||||
[2026-03-23 14:21:35] ⚠️ git pull失败,继续检查
|
||||
[2026-03-23 14:21:35] ⚠️ git pull失败,继续检查
|
||||
[2026-03-23 14:21:35] jiangwei 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
There are no candidates for merging among the refs that you just fetched.
|
||||
Generally this means that you provided a wildcard refspec which had no
|
||||
matches on the remote end.
|
||||
[2026-03-23 14:22:06] ⚠️ git pull失败,继续检查
|
||||
[2026-03-23 14:22:06] ⚠️ git pull失败,继续检查
|
||||
[2026-03-23 14:22:06] jiangwei 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:22:36] ✅ git pull成功
|
||||
[2026-03-23 14:22:36] ✅ git pull成功
|
||||
[2026-03-23 14:22:36] jiangwei 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
There are no candidates for merging among the refs that you just fetched.
|
||||
Generally this means that you provided a wildcard refspec which had no
|
||||
matches on the remote end.
|
||||
[2026-03-23 14:23:07] ⚠️ git pull失败,继续检查
|
||||
[2026-03-23 14:23:07] ⚠️ git pull失败,继续检查
|
||||
[2026-03-23 14:23:07] jiangwei 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:23:38] ✅ git pull成功
|
||||
[2026-03-23 14:23:38] ✅ git pull成功
|
||||
[2026-03-23 14:23:38] jiangwei 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:24:09] ✅ git pull成功
|
||||
[2026-03-23 14:24:09] ✅ git pull成功
|
||||
[2026-03-23 14:24:09] jiangwei 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
There are no candidates for merging among the refs that you just fetched.
|
||||
Generally this means that you provided a wildcard refspec which had no
|
||||
matches on the remote end.
|
||||
[2026-03-23 14:24:40] ⚠️ git pull失败,继续检查
|
||||
[2026-03-23 14:24:40] ⚠️ git pull失败,继续检查
|
||||
[2026-03-23 14:24:40] jiangwei 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
There are no candidates for merging among the refs that you just fetched.
|
||||
Generally this means that you provided a wildcard refspec which had no
|
||||
matches on the remote end.
|
||||
[2026-03-23 14:25:11] ⚠️ git pull失败,继续检查
|
||||
[2026-03-23 14:25:11] ⚠️ git pull失败,继续检查
|
||||
[2026-03-23 14:25:11] jiangwei 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
There are no candidates for merging among the refs that you just fetched.
|
||||
Generally this means that you provided a wildcard refspec which had no
|
||||
matches on the remote end.
|
||||
[2026-03-23 14:25:42] ⚠️ git pull失败,继续检查
|
||||
[2026-03-23 14:25:42] ⚠️ git pull失败,继续检查
|
||||
[2026-03-23 14:25:42] jiangwei 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:26:13] ✅ git pull成功
|
||||
[2026-03-23 14:26:13] ✅ git pull成功
|
||||
[2026-03-23 14:26:13] jiangwei 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:26:43] ✅ git pull成功
|
||||
[2026-03-23 14:26:43] ✅ git pull成功
|
||||
[2026-03-23 14:26:43] jiangwei 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
670b4d2..a0267bd main -> origin/main
|
||||
Updating 670b4d2..a0267bd
|
||||
Fast-forward
|
||||
management/agents/guanyu/TASK-20260323142621.task | 12 ++++++++++++
|
||||
management/agents/pangtong/TASK-20260323142603.task | 12 ++++++++++++
|
||||
management/agents/simayi/TASK-20260323142641.task | 12 ++++++++++++
|
||||
management/tasks/assigned/TASK-20260323142603.md | 12 ++++++++++++
|
||||
management/tasks/assigned/TASK-20260323142621.md | 12 ++++++++++++
|
||||
management/tasks/assigned/TASK-20260323142641.md | 12 ++++++++++++
|
||||
management/tasks/pending/TASK-20260323142603.md | 12 ++++++++++++
|
||||
management/tasks/pending/TASK-20260323142621.md | 12 ++++++++++++
|
||||
management/tasks/pending/TASK-20260323142641.md | 12 ++++++++++++
|
||||
9 files changed, 108 insertions(+)
|
||||
create mode 100644 management/agents/guanyu/TASK-20260323142621.task
|
||||
create mode 100644 management/agents/pangtong/TASK-20260323142603.task
|
||||
create mode 100644 management/agents/simayi/TASK-20260323142641.task
|
||||
create mode 100644 management/tasks/assigned/TASK-20260323142603.md
|
||||
create mode 100644 management/tasks/assigned/TASK-20260323142621.md
|
||||
create mode 100644 management/tasks/assigned/TASK-20260323142641.md
|
||||
create mode 100644 management/tasks/pending/TASK-20260323142603.md
|
||||
create mode 100644 management/tasks/pending/TASK-20260323142621.md
|
||||
create mode 100644 management/tasks/pending/TASK-20260323142641.md
|
||||
[2026-03-23 14:27:14] ✅ git pull成功
|
||||
[2026-03-23 14:27:14] ✅ git pull成功
|
||||
[2026-03-23 14:27:14] jiangwei 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:27:45] ✅ git pull成功
|
||||
[2026-03-23 14:27:45] ✅ git pull成功
|
||||
[2026-03-23 14:27:45] jiangwei 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:28:16] ✅ git pull成功
|
||||
[2026-03-23 14:28:16] ✅ git pull成功
|
||||
[2026-03-23 14:28:16] jiangwei 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:28:47] ✅ git pull成功
|
||||
[2026-03-23 14:28:47] ✅ git pull成功
|
||||
[2026-03-23 14:28:47] jiangwei 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:29:18] ✅ git pull成功
|
||||
[2026-03-23 14:29:18] ✅ git pull成功
|
||||
[2026-03-23 14:29:18] jiangwei 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:29:49] ✅ git pull成功
|
||||
[2026-03-23 14:29:49] ✅ git pull成功
|
||||
[2026-03-23 14:29:49] jiangwei 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:30:20] ✅ git pull成功
|
||||
[2026-03-23 14:30:20] ✅ git pull成功
|
||||
[2026-03-23 14:30:20] jiangwei 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:30:51] ✅ git pull成功
|
||||
[2026-03-23 14:30:51] ✅ git pull成功
|
||||
[2026-03-23 14:30:51] jiangwei 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:31:22] ✅ git pull成功
|
||||
[2026-03-23 14:31:22] ✅ git pull成功
|
||||
[2026-03-23 14:31:22] jiangwei 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:31:53] ✅ git pull成功
|
||||
[2026-03-23 14:31:53] ✅ git pull成功
|
||||
[2026-03-23 14:31:53] jiangwei 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:32:24] ✅ git pull成功
|
||||
[2026-03-23 14:32:24] ✅ git pull成功
|
||||
[2026-03-23 14:32:24] jiangwei 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:32:55] ✅ git pull成功
|
||||
[2026-03-23 14:32:55] ✅ git pull成功
|
||||
[2026-03-23 14:32:55] jiangwei 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:33:26] ✅ git pull成功
|
||||
[2026-03-23 14:33:26] ✅ git pull成功
|
||||
[2026-03-23 14:33:26] jiangwei 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
6c49c85..e965d7e main -> origin/main
|
||||
Updating 6c49c85..e965d7e
|
||||
Fast-forward
|
||||
management/agents/zhaoyun/TASK-20260323142455.done | 21 +++++++++++++++++++++
|
||||
1 file changed, 21 insertions(+)
|
||||
create mode 100644 management/agents/zhaoyun/TASK-20260323142455.done
|
||||
[2026-03-23 14:33:57] ✅ git pull成功
|
||||
[2026-03-23 14:33:57] ✅ git pull成功
|
||||
[2026-03-23 14:33:57] jiangwei 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:34:28] ✅ git pull成功
|
||||
[2026-03-23 14:34:28] ✅ git pull成功
|
||||
[2026-03-23 14:34:28] jiangwei 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:34:58] ✅ git pull成功
|
||||
[2026-03-23 14:34:58] ✅ git pull成功
|
||||
[2026-03-23 14:34:58] jiangwei 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:35:29] ✅ git pull成功
|
||||
[2026-03-23 14:35:29] ✅ git pull成功
|
||||
[2026-03-23 14:35:29] jiangwei 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:36:00] ✅ git pull成功
|
||||
[2026-03-23 14:36:00] ✅ git pull成功
|
||||
[2026-03-23 14:36:00] jiangwei 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:36:31] ✅ git pull成功
|
||||
[2026-03-23 14:36:31] ✅ git pull成功
|
||||
[2026-03-23 14:36:31] jiangwei 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:37:02] ✅ git pull成功
|
||||
[2026-03-23 14:37:02] ✅ git pull成功
|
||||
[2026-03-23 14:37:02] jiangwei 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:37:33] ✅ git pull成功
|
||||
[2026-03-23 14:37:33] ✅ git pull成功
|
||||
[2026-03-23 14:37:33] jiangwei 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:38:04] ✅ git pull成功
|
||||
[2026-03-23 14:38:04] ✅ git pull成功
|
||||
[2026-03-23 14:38:04] jiangwei 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:38:35] ✅ git pull成功
|
||||
[2026-03-23 14:38:35] ✅ git pull成功
|
||||
[2026-03-23 14:38:35] jiangwei 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
e965d7e..1ea364c main -> origin/main
|
||||
Updating e965d7e..1ea364c
|
||||
Fast-forward
|
||||
management/agents/guanyu/TASK-20260323133712.done | 20 ++++++++++++++++++++
|
||||
management/agents/guanyu/TASK-20260323142621.done | 20 ++++++++++++++++++++
|
||||
management/agents/simayi/TASK-20260323133817.done | 21 +++++++++++++++++++++
|
||||
management/agents/simayi/TASK-20260323142641.done | 20 ++++++++++++++++++++
|
||||
4 files changed, 81 insertions(+)
|
||||
create mode 100644 management/agents/guanyu/TASK-20260323133712.done
|
||||
create mode 100644 management/agents/guanyu/TASK-20260323142621.done
|
||||
create mode 100644 management/agents/simayi/TASK-20260323133817.done
|
||||
create mode 100644 management/agents/simayi/TASK-20260323142641.done
|
||||
[2026-03-23 14:39:06] ✅ git pull成功
|
||||
[2026-03-23 14:39:06] ✅ git pull成功
|
||||
[2026-03-23 14:39:06] jiangwei 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:39:37] ✅ git pull成功
|
||||
[2026-03-23 14:39:37] ✅ git pull成功
|
||||
[2026-03-23 14:39:37] jiangwei 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:40:08] ✅ git pull成功
|
||||
[2026-03-23 14:40:08] ✅ git pull成功
|
||||
[2026-03-23 14:40:08] jiangwei 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:40:39] ✅ git pull成功
|
||||
[2026-03-23 14:40:39] ✅ git pull成功
|
||||
[2026-03-23 14:40:39] jiangwei 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:41:10] ✅ git pull成功
|
||||
[2026-03-23 14:41:10] ✅ git pull成功
|
||||
[2026-03-23 14:41:10] jiangwei 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:41:41] ✅ git pull成功
|
||||
[2026-03-23 14:41:41] ✅ git pull成功
|
||||
[2026-03-23 14:41:41] jiangwei 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:42:12] ✅ git pull成功
|
||||
[2026-03-23 14:42:12] ✅ git pull成功
|
||||
[2026-03-23 14:42:12] jiangwei 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
There are no candidates for merging among the refs that you just fetched.
|
||||
Generally this means that you provided a wildcard refspec which had no
|
||||
matches on the remote end.
|
||||
[2026-03-23 14:42:43] ⚠️ git pull失败,继续检查
|
||||
[2026-03-23 14:42:43] ⚠️ git pull失败,继续检查
|
||||
[2026-03-23 14:42:43] jiangwei 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
There are no candidates for merging among the refs that you just fetched.
|
||||
Generally this means that you provided a wildcard refspec which had no
|
||||
matches on the remote end.
|
||||
[2026-03-23 14:43:14] ⚠️ git pull失败,继续检查
|
||||
[2026-03-23 14:43:14] ⚠️ git pull失败,继续检查
|
||||
[2026-03-23 14:43:14] jiangwei 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:43:44] ✅ git pull成功
|
||||
[2026-03-23 14:43:44] ✅ git pull成功
|
||||
[2026-03-23 14:43:44] jiangwei 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:44:15] ✅ git pull成功
|
||||
[2026-03-23 14:44:15] ✅ git pull成功
|
||||
[2026-03-23 14:44:15] jiangwei 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:44:47] ✅ git pull成功
|
||||
[2026-03-23 14:44:47] ✅ git pull成功
|
||||
[2026-03-23 14:44:47] jiangwei 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:45:17] ✅ git pull成功
|
||||
[2026-03-23 14:45:17] ✅ git pull成功
|
||||
[2026-03-23 14:45:17] jiangwei 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:45:48] ✅ git pull成功
|
||||
[2026-03-23 14:45:48] ✅ git pull成功
|
||||
[2026-03-23 14:45:48] jiangwei 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:46:19] ✅ git pull成功
|
||||
[2026-03-23 14:46:19] ✅ git pull成功
|
||||
[2026-03-23 14:46:19] jiangwei 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:46:50] ✅ git pull成功
|
||||
[2026-03-23 14:46:50] ✅ git pull成功
|
||||
[2026-03-23 14:46:50] jiangwei 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:47:21] ✅ git pull成功
|
||||
[2026-03-23 14:47:21] ✅ git pull成功
|
||||
[2026-03-23 14:47:21] jiangwei 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:47:52] ✅ git pull成功
|
||||
[2026-03-23 14:47:52] ✅ git pull成功
|
||||
[2026-03-23 14:47:52] jiangwei 无新任务
|
||||
=========================================
|
||||
=========================================
|
||||
Agent监控启动 - jiangwei
|
||||
Agent监控启动 - jiangwei
|
||||
启动时间: 2026-03-23 14:48:11
|
||||
启动时间: 2026-03-23 14:48:11
|
||||
监控目录: management/agents/jiangwei
|
||||
监控目录: management/agents/jiangwei
|
||||
检查间隔: 30秒
|
||||
检查间隔: 30秒
|
||||
自动git pull: 每次检查前自动拉取
|
||||
自动git pull: 每次检查前自动拉取
|
||||
=========================================
|
||||
=========================================
|
||||
🚀 jiangwei Agent监控器启动
|
||||
📊 监控目录: management/agents/jiangwei
|
||||
📝 日志文件: jiangwei_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:11] ✅ git pull成功
|
||||
[2026-03-23 14:48:11] ✅ git pull成功
|
||||
[2026-03-23 14:48:11] jiangwei 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:48:42] ✅ git pull成功
|
||||
[2026-03-23 14:48:42] ✅ git pull成功
|
||||
[2026-03-23 14:48:42] jiangwei 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:49:13] ✅ git pull成功
|
||||
[2026-03-23 14:49:13] ✅ git pull成功
|
||||
[2026-03-23 14:49:13] jiangwei 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:49:44] ✅ git pull成功
|
||||
[2026-03-23 14:49:44] ✅ git pull成功
|
||||
[2026-03-23 14:49:44] jiangwei 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:50:14] ✅ git pull成功
|
||||
[2026-03-23 14:50:14] ✅ git pull成功
|
||||
[2026-03-23 14:50:14] jiangwei 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:50:45] ✅ git pull成功
|
||||
[2026-03-23 14:50:45] ✅ git pull成功
|
||||
[2026-03-23 14:50:45] jiangwei 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:51:16] ✅ git pull成功
|
||||
[2026-03-23 14:51:16] ✅ git pull成功
|
||||
[2026-03-23 14:51:16] jiangwei 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:51:47] ✅ git pull成功
|
||||
[2026-03-23 14:51:47] ✅ git pull成功
|
||||
[2026-03-23 14:51:47] jiangwei 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:52:18] ✅ git pull成功
|
||||
[2026-03-23 14:52:18] ✅ git pull成功
|
||||
[2026-03-23 14:52:18] jiangwei 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:52:49] ✅ git pull成功
|
||||
[2026-03-23 14:52:49] ✅ git pull成功
|
||||
[2026-03-23 14:52:49] jiangwei 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:53:20] ✅ git pull成功
|
||||
[2026-03-23 14:53:20] ✅ git pull成功
|
||||
[2026-03-23 14:53:20] jiangwei 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:53:51] ✅ git pull成功
|
||||
[2026-03-23 14:53:51] ✅ git pull成功
|
||||
[2026-03-23 14:53:51] jiangwei 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:54:22] ✅ git pull成功
|
||||
[2026-03-23 14:54:22] ✅ git pull成功
|
||||
[2026-03-23 14:54:22] jiangwei 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:54:53] ✅ git pull成功
|
||||
[2026-03-23 14:54:53] ✅ git pull成功
|
||||
[2026-03-23 14:54:53] jiangwei 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:55:23] ✅ git pull成功
|
||||
[2026-03-23 14:55:23] ✅ git pull成功
|
||||
[2026-03-23 14:55:23] jiangwei 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:55:54] ✅ git pull成功
|
||||
[2026-03-23 14:55:54] ✅ git pull成功
|
||||
[2026-03-23 14:55:54] jiangwei 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 14:56:25] ✅ git pull成功
|
||||
[2026-03-23 14:56:25] ✅ git pull成功
|
||||
[2026-03-23 14:56:25] jiangwei 无新任务
|
||||
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:56] ⚠️ git pull失败,继续检查
|
||||
[2026-03-23 14:56:56] ⚠️ git pull失败,继续检查
|
||||
[2026-03-23 14:56:56] jiangwei 无新任务
|
||||
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:27] ⚠️ git pull失败,继续检查
|
||||
[2026-03-23 14:57:27] ⚠️ git pull失败,继续检查
|
||||
[2026-03-23 14:57:27] jiangwei 无新任务
|
||||
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:58] ⚠️ git pull失败,继续检查
|
||||
[2026-03-23 14:57:58] ⚠️ git pull失败,继续检查
|
||||
[2026-03-23 14:57:58] jiangwei 无新任务
|
||||
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:29] ⚠️ git pull失败,继续检查
|
||||
[2026-03-23 14:58:29] ⚠️ git pull失败,继续检查
|
||||
[2026-03-23 14:58:29] jiangwei 无新任务
|
||||
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:00] ⚠️ git pull失败,继续检查
|
||||
[2026-03-23 14:59:00] ⚠️ git pull失败,继续检查
|
||||
[2026-03-23 14:59:00] jiangwei 无新任务
|
||||
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:31] ⚠️ git pull失败,继续检查
|
||||
[2026-03-23 14:59:31] ⚠️ git pull失败,继续检查
|
||||
[2026-03-23 14:59:31] jiangwei 无新任务
|
||||
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:02] ⚠️ git pull失败,继续检查
|
||||
[2026-03-23 15:00:02] ⚠️ git pull失败,继续检查
|
||||
[2026-03-23 15:00:02] jiangwei 无新任务
|
||||
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:33] ⚠️ git pull失败,继续检查
|
||||
[2026-03-23 15:00:33] ⚠️ git pull失败,继续检查
|
||||
[2026-03-23 15:00:33] jiangwei 无新任务
|
||||
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:04] ⚠️ git pull失败,继续检查
|
||||
[2026-03-23 15:01:04] ⚠️ git pull失败,继续检查
|
||||
[2026-03-23 15:01:04] jiangwei 无新任务
|
||||
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:35] ⚠️ git pull失败,继续检查
|
||||
[2026-03-23 15:01:35] ⚠️ git pull失败,继续检查
|
||||
[2026-03-23 15:01:35] jiangwei 无新任务
|
||||
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:06] ⚠️ git pull失败,继续检查
|
||||
[2026-03-23 15:02:06] ⚠️ git pull失败,继续检查
|
||||
[2026-03-23 15:02:06] jiangwei 无新任务
|
||||
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:37] ⚠️ git pull失败,继续检查
|
||||
[2026-03-23 15:02:37] ⚠️ git pull失败,继续检查
|
||||
[2026-03-23 15:02:37] jiangwei 无新任务
|
||||
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:08] ⚠️ git pull失败,继续检查
|
||||
[2026-03-23 15:03:08] ⚠️ git pull失败,继续检查
|
||||
[2026-03-23 15:03:08] jiangwei 无新任务
|
||||
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:39] ⚠️ git pull失败,继续检查
|
||||
[2026-03-23 15:03:39] ⚠️ git pull失败,继续检查
|
||||
[2026-03-23 15:03:39] jiangwei 无新任务
|
||||
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:10] ⚠️ git pull失败,继续检查
|
||||
[2026-03-23 15:04:10] ⚠️ git pull失败,继续检查
|
||||
[2026-03-23 15:04:10] jiangwei 无新任务
|
||||
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:41] ⚠️ git pull失败,继续检查
|
||||
[2026-03-23 15:04:41] ⚠️ git pull失败,继续检查
|
||||
[2026-03-23 15:04:41] jiangwei 无新任务
|
||||
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:11] ⚠️ git pull失败,继续检查
|
||||
[2026-03-23 15:05:11] ⚠️ git pull失败,继续检查
|
||||
[2026-03-23 15:05:11] jiangwei 无新任务
|
||||
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:42] ⚠️ git pull失败,继续检查
|
||||
[2026-03-23 15:05:42] ⚠️ git pull失败,继续检查
|
||||
[2026-03-23 15:05:42] jiangwei 无新任务
|
||||
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:13] ⚠️ git pull失败,继续检查
|
||||
[2026-03-23 15:06:13] ⚠️ git pull失败,继续检查
|
||||
[2026-03-23 15:06:13] jiangwei 无新任务
|
||||
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:44] ⚠️ git pull失败,继续检查
|
||||
[2026-03-23 15:06:44] ⚠️ git pull失败,继续检查
|
||||
[2026-03-23 15:06:44] jiangwei 无新任务
|
||||
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:15] ⚠️ git pull失败,继续检查
|
||||
[2026-03-23 15:07:15] ⚠️ git pull失败,继续检查
|
||||
[2026-03-23 15:07:15] jiangwei 无新任务
|
||||
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:46] ⚠️ git pull失败,继续检查
|
||||
[2026-03-23 15:07:46] ⚠️ git pull失败,继续检查
|
||||
[2026-03-23 15:07:46] jiangwei 无新任务
|
||||
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:17] ⚠️ git pull失败,继续检查
|
||||
[2026-03-23 15:08:17] ⚠️ git pull失败,继续检查
|
||||
[2026-03-23 15:08:17] jiangwei 无新任务
|
||||
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:48] ⚠️ git pull失败,继续检查
|
||||
[2026-03-23 15:08:48] ⚠️ git pull失败,继续检查
|
||||
[2026-03-23 15:08:48] jiangwei 无新任务
|
||||
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:19] ⚠️ git pull失败,继续检查
|
||||
[2026-03-23 15:09:19] ⚠️ git pull失败,继续检查
|
||||
[2026-03-23 15:09:19] jiangwei 无新任务
|
||||
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:50] ⚠️ git pull失败,继续检查
|
||||
[2026-03-23 15:09:50] ⚠️ git pull失败,继续检查
|
||||
[2026-03-23 15:09:50] jiangwei 无新任务
|
||||
|
||||
Reference in New Issue
Block a user