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

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

Browse Source
This commit is contained in:
cfdaily
2026-03-23 19:01:10 +08:00
parent 9c2afea392
commit ce25ea62e0
1 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pangtong_monitor.log
+17
View File
@@ -5822,3 +5822,20 @@ From gitee.com:cfdaily/sanguo_quant_live
Already up to date.
[2026-03-23 19:00:38] ✅ git pull成功
[2026-03-23 19:00:38] pangtong 无新任务
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 45c5de192c3213abcac5c68681e87949e9817c60.
error: The following untracked working tree files would be overwritten by merge:
management/tasks/pending/TASK-20260323190110.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 45c5de192c3213abcac5c68681e87949e9817c60
output, run
$ git reset --hard
to recover.
[2026-03-23 19:01:09] ⚠️ git pull失败，继续检查
[2026-03-23 19:01:09] pangtong 无新任务