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

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

Browse Source
This commit is contained in:
cfdaily
2026-03-23 19:04:08 +08:00
parent cc6a032eaa
commit b90428e433
3 changed files with 30 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zhaoyun_monitor.log
+18
View File
@@ -4971,3 +4971,21 @@ matches on the remote end.
[2026-03-23 19:03:35] ⚠️ git pull失败，继续检查
[2026-03-23 19:03:35] ⚠️ git pull失败，继续检查
[2026-03-23 19:03:35] 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 ca2783f6c1e8042ee6969e726c336f7921434516.
error: The following untracked working tree files would be overwritten by merge:
management/tasks/pending/TASK-20260323190407.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 ca2783f6c1e8042ee6969e726c336f7921434516
output, run
$ git reset --hard
to recover.
[2026-03-23 19:04:06] ⚠️ git pull失败，继续检查
[2026-03-23 19:04:06] ⚠️ git pull失败，继续检查
[2026-03-23 19:04:06] zhaoyun 无新任务