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

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

Browse Source
This commit is contained in:
cfdaily
2026-03-23 19:07:21 +08:00
parent 2089784c1a
commit beaf713386
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
@@ -6014,3 +6014,20 @@ $ git reset --hard
to recover.
[2026-03-23 19:06:49] ⚠️ git pull失败，继续检查
[2026-03-23 19:06:49] 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 f970c9f54897cd6d52fb951de1fc3a3dfc3c4af7.
error: The following untracked working tree files would be overwritten by merge:
management/tasks/pending/TASK-20260323190721.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 f970c9f54897cd6d52fb951de1fc3a3dfc3c4af7
output, run
$ git reset --hard
to recover.
[2026-03-23 19:07:20] ⚠️ git pull失败，继续检查
[2026-03-23 19:07:20] pangtong 无新任务