sanguo/sanguo_quant_live
8
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 最终修复 - 先stash再创建文件，避免新文件被stash

Browse Source
This commit is contained in:
cfdaily
2026-03-23 16:52:20 +08:00
parent 00c590d7a6
commit 4d2f971072
2 changed files with 398 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
guanyu_monitor.log
+201
View File
@@ -2768,3 +2768,204 @@ hint: as appropriate to mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict.
[2026-03-23 16:33:09] ⚠️ git pull失败，继续检查
[2026-03-23 16:33:09] guanyu 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
874cea6..de56c83 main -> origin/main
Updating 874cea6..de56c83
Fast-forward
management/agents/pangtong/TASK-20260323161844.task | 8 --------
management/agents/pangtong/TASK-20260323161907.task | 8 --------
management/agents/pangtong/TASK-20260323161945.task | 12 ------------
3 files changed, 28 deletions(-)
delete mode 100644 management/agents/pangtong/TASK-20260323161844.task
delete mode 100644 management/agents/pangtong/TASK-20260323161907.task
delete mode 100644 management/agents/pangtong/TASK-20260323161945.task
[2026-03-23 16:33:40] ✅ git pull成功
[2026-03-23 16:33:40] guanyu 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 16:34:10] ✅ git pull成功
[2026-03-23 16:34:10] guanyu 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 16:34:41] ✅ git pull成功
[2026-03-23 16:34:41] guanyu 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 16:35:12] ✅ git pull成功
[2026-03-23 16:35:12] guanyu 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 16:35:43] ✅ git pull成功
[2026-03-23 16:35:43] guanyu 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 16:36:14] ✅ git pull成功
[2026-03-23 16:36:14] guanyu 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 16:36:45] ✅ git pull成功
[2026-03-23 16:36:45] guanyu 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 16:37:16] ✅ git pull成功
[2026-03-23 16:37:16] guanyu 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 16:37:47] ✅ git pull成功
[2026-03-23 16:37:47] guanyu 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 16:38:18] ✅ git pull成功
[2026-03-23 16:38:18] guanyu 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 16:38:48] ✅ git pull成功
[2026-03-23 16:38:48] guanyu 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 16:39:19] ✅ git pull成功
[2026-03-23 16:39:19] guanyu 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 16:39:50] ✅ git pull成功
[2026-03-23 16:39:50] guanyu 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 16:40:21] ✅ git pull成功
[2026-03-23 16:40:21] guanyu 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 16:40:52] ✅ git pull成功
[2026-03-23 16:40:52] guanyu 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 16:41:23] ✅ git pull成功
[2026-03-23 16:41:23] guanyu 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 16:41:54] ✅ git pull成功
[2026-03-23 16:41:54] guanyu 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 16:42:25] ✅ git pull成功
[2026-03-23 16:42:25] guanyu 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 16:42:56] ✅ git pull成功
[2026-03-23 16:42:56] guanyu 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 16:43:27] ✅ git pull成功
[2026-03-23 16:43:27] guanyu 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 16:43:58] ✅ git pull成功
[2026-03-23 16:43:58] guanyu 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 16:44:29] ✅ git pull成功
[2026-03-23 16:44:29] guanyu 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 16:45:00] ✅ git pull成功
[2026-03-23 16:45:00] guanyu 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 16:45:31] ✅ git pull成功
[2026-03-23 16:45:31] guanyu 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 16:46:01] ✅ git pull成功
[2026-03-23 16:46:01] guanyu 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 16:46:32] ✅ git pull成功
[2026-03-23 16:46:32] guanyu 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 16:47:03] ✅ git pull成功
[2026-03-23 16:47:03] guanyu 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 16:47:34] ✅ git pull成功
[2026-03-23 16:47:34] guanyu 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 16:48:05] ✅ git pull成功
[2026-03-23 16:48:05] guanyu 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 16:48:36] ✅ git pull成功
[2026-03-23 16:48:36] guanyu 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 16:49:07] ✅ git pull成功
[2026-03-23 16:49:07] guanyu 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 16:49:38] ✅ git pull成功
[2026-03-23 16:49:38] guanyu 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
2f9bb89..70440c7 main -> origin/main
Updating 2f9bb89..70440c7
Fast-forward
management/agents/pangtong/TASK-20260323164718.task | 6 ------
management/agents/pangtong/TASK-20260323164949.task | 6 ------
2 files changed, 12 deletions(-)
delete mode 100644 management/agents/pangtong/TASK-20260323164718.task
delete mode 100644 management/agents/pangtong/TASK-20260323164949.task
[2026-03-23 16:50:09] ✅ git pull成功
[2026-03-23 16:50:09] guanyu 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 16:50:40] ✅ git pull成功
[2026-03-23 16:50:40] guanyu 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 16:51:11] ✅ git pull成功
[2026-03-23 16:51:11] guanyu 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 16:51:41] ✅ git pull成功
[2026-03-23 16:51:41] guanyu 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 16:52:12] ✅ git pull成功
[2026-03-23 16:52:12] guanyu 无新任务
zhangfei_monitor.log
+197
View File
@@ -2136,3 +2136,200 @@ hint: as appropriate to mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict.
[2026-03-23 16:32:58] ⚠️ git pull失败，继续检查
[2026-03-23 16:32:58] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
afd1b60..874cea6 main -> origin/main
Already up to date.
[2026-03-23 16:33:28] ✅ git pull成功
[2026-03-23 16:33:28] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
de56c83..3e7f638 main -> origin/main
Updating de56c83..3e7f638
Fast-forward
management/agents/jiangwei/TASK-20260323162224.task | 8 --------
management/agents/simayi/TASK-20260323162326.task | 8 --------
2 files changed, 16 deletions(-)
delete mode 100644 management/agents/jiangwei/TASK-20260323162224.task
delete mode 100644 management/agents/simayi/TASK-20260323162326.task
[2026-03-23 16:33:59] ✅ git pull成功
[2026-03-23 16:33:59] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 16:34:30] ✅ git pull成功
[2026-03-23 16:34:30] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 16:35:01] ✅ git pull成功
[2026-03-23 16:35:01] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 16:35:32] ✅ git pull成功
[2026-03-23 16:35:32] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 16:36:03] ✅ git pull成功
[2026-03-23 16:36:03] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 16:36:34] ✅ git pull成功
[2026-03-23 16:36:34] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 16:37:05] ✅ git pull成功
[2026-03-23 16:37:05] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 16:37:36] ✅ git pull成功
[2026-03-23 16:37:36] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 16:38:07] ✅ git pull成功
[2026-03-23 16:38:07] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 16:38:38] ✅ git pull成功
[2026-03-23 16:38:38] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 16:39:09] ✅ git pull成功
[2026-03-23 16:39:09] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 16:39:40] ✅ git pull成功
[2026-03-23 16:39:40] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 16:40:11] ✅ git pull成功
[2026-03-23 16:40:11] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 16:40:42] ✅ git pull成功
[2026-03-23 16:40:42] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 16:41:12] ✅ git pull成功
[2026-03-23 16:41:12] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 16:41:43] ✅ git pull成功
[2026-03-23 16:41:43] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 16:42:15] ✅ git pull成功
[2026-03-23 16:42:15] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 16:42:45] ✅ git pull成功
[2026-03-23 16:42:45] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 16:43:16] ✅ git pull成功
[2026-03-23 16:43:16] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 16:43:47] ✅ git pull成功
[2026-03-23 16:43:47] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 16:44:18] ✅ git pull成功
[2026-03-23 16:44:18] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 16:44:49] ✅ git pull成功
[2026-03-23 16:44:49] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 16:45:20] ✅ git pull成功
[2026-03-23 16:45:20] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 16:45:51] ✅ git pull成功
[2026-03-23 16:45:51] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 16:46:22] ✅ git pull成功
[2026-03-23 16:46:22] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 16:46:53] ✅ git pull成功
[2026-03-23 16:46:53] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 16:47:24] ✅ git pull成功
[2026-03-23 16:47:24] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 16:47:54] ✅ git pull成功
[2026-03-23 16:47:54] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 16:48:25] ✅ git pull成功
[2026-03-23 16:48:25] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 16:48:56] ✅ git pull成功
[2026-03-23 16:48:56] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 16:49:27] ✅ git pull成功
[2026-03-23 16:49:27] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 16:49:58] ✅ git pull成功
[2026-03-23 16:49:58] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 16:50:29] ✅ git pull成功
[2026-03-23 16:50:29] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 16:51:00] ✅ git pull成功
[2026-03-23 16:51:00] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 16:51:31] ✅ git pull成功
[2026-03-23 16:51:31] zhangfei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
b7a855c..48a7929 main -> origin/main
Merge made by the 'ort' strategy.
management/agents/pangtong/TASK-20260323165126.task | 6 ------
1 file changed, 6 deletions(-)
delete mode 100644 management/agents/pangtong/TASK-20260323165126.task
[2026-03-23 16:52:02] ✅ git pull成功
[2026-03-23 16:52:02] zhangfei 无新任务