sanguo/sanguo_quant_live
9
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 无新任务