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

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

Browse Source
This commit is contained in:
cfdaily
2026-03-23 19:09:48 +08:00
parent 1eddb6eb03
commit 98929b5ceb
3 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zhaoyun_monitor.log
+18
View File
@@ -5160,3 +5160,21 @@ Already up to date.
[2026-03-23 19:09:15] ✅ git pull成功
[2026-03-23 19:09:15] ✅ git pull成功
[2026-03-23 19:09:15] 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 e1ed5b26eb92f8da497c5df80f223b64544d4fb9.
error: The following untracked working tree files would be overwritten by merge:
management/tasks/pending/TASK-20260323190947.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 e1ed5b26eb92f8da497c5df80f223b64544d4fb9
output, run
$ git reset --hard
to recover.
[2026-03-23 19:09:46] ⚠️ git pull失败，继续检查
[2026-03-23 19:09:46] ⚠️ git pull失败，继续检查
[2026-03-23 19:09:46] zhaoyun 无新任务