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

sync: 自动同步未提交变更 [create TASK-20260323184912]

Browse Source
This commit is contained in:
cfdaily
2026-03-23 18:49:12 +08:00
parent 65f7b53bbe
commit f3ec850e78
2 changed files with 36 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
guanyu_monitor.log
+18
View File
@@ -5902,3 +5902,21 @@ Already up to date.
[2026-03-23 18:48:40] ✅ git pull成功
[2026-03-23 18:48:40] ✅ git pull成功
[2026-03-23 18:48:40] guanyu 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
warning: fetch updated the current branch head.
fast-forwarding your working tree from
commit c15742166d3ec8c9cee9341ddfa70803bacfb296.
error: The following untracked working tree files would be overwritten by merge:
management/tasks/pending/TASK-20260323184912.md
Please move or remove them before you merge.
Aborting
fatal: Cannot fast-forward your working tree.
After making sure that you saved anything precious from
$ git diff c15742166d3ec8c9cee9341ddfa70803bacfb296
output, run
$ git reset --hard
to recover.
[2026-03-23 18:49:11] ⚠️ git pull失败，继续检查
[2026-03-23 18:49:11] ⚠️ git pull失败，继续检查
[2026-03-23 18:49:11] guanyu 无新任务
zhaoyun_monitor.log
+18
View File
@@ -4591,3 +4591,21 @@ Already up to date.
[2026-03-23 18:48:40] ✅ git pull成功
[2026-03-23 18:48:40] ✅ git pull成功
[2026-03-23 18:48:40] zhaoyun 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
warning: fetch updated the current branch head.
fast-forwarding your working tree from
commit c15742166d3ec8c9cee9341ddfa70803bacfb296.
error: The following untracked working tree files would be overwritten by merge:
management/tasks/pending/TASK-20260323184912.md
Please move or remove them before you merge.
Aborting
fatal: Cannot fast-forward your working tree.
After making sure that you saved anything precious from
$ git diff c15742166d3ec8c9cee9341ddfa70803bacfb296
output, run
$ git reset --hard
to recover.
[2026-03-23 18:49:11] ⚠️ git pull失败，继续检查
[2026-03-23 18:49:11] ⚠️ git pull失败，继续检查
[2026-03-23 18:49:11] zhaoyun 无新任务