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

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

Browse Source
This commit is contained in:
cfdaily
2026-03-23 19:49:02 +08:00
parent c2e2191bc5
commit b24a90d371
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
@@ -7361,3 +7361,21 @@ to recover.
[2026-03-23 19:48:30] ⚠️ git pull失败，继续检查
[2026-03-23 19:48:30] ⚠️ git pull失败，继续检查
[2026-03-23 19:48:30] 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 3f9da995d42617783602d2fa9aa9d9ad7625df48.
error: The following untracked working tree files would be overwritten by merge:
management/tasks/pending/TASK-20260323194902.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 3f9da995d42617783602d2fa9aa9d9ad7625df48
output, run
$ git reset --hard
to recover.
[2026-03-23 19:49:01] ⚠️ git pull失败，继续检查
[2026-03-23 19:49:01] ⚠️ git pull失败，继续检查
[2026-03-23 19:49:01] guanyu 无新任务
zhaoyun_monitor.log
+18
View File
@@ -5913,3 +5913,21 @@ to recover.
[2026-03-23 19:48:30] ⚠️ git pull失败，继续检查
[2026-03-23 19:48:30] ⚠️ git pull失败，继续检查
[2026-03-23 19:48:30] 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 3f9da995d42617783602d2fa9aa9d9ad7625df48.
error: The following untracked working tree files would be overwritten by merge:
management/tasks/pending/TASK-20260323194902.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 3f9da995d42617783602d2fa9aa9d9ad7625df48
output, run
$ git reset --hard
to recover.
[2026-03-23 19:49:01] ⚠️ git pull失败，继续检查
[2026-03-23 19:49:01] ⚠️ git pull失败，继续检查
[2026-03-23 19:49:01] zhaoyun 无新任务