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

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

Browse Source
This commit is contained in:
cfdaily
2026-03-23 19:45:34 +08:00
parent 658ca24e5a
commit 1d2f935071
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
@@ -6683,3 +6683,20 @@ $ git reset --hard
to recover.
[2026-03-23 19:45:02] ⚠️ git pull失败，继续检查
[2026-03-23 19:45:02] 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 f5efebd783641ab842838d8094300e4fb1c46683.
error: The following untracked working tree files would be overwritten by merge:
management/tasks/pending/TASK-20260323194534.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 f5efebd783641ab842838d8094300e4fb1c46683
output, run
$ git reset --hard
to recover.
[2026-03-23 19:45:33] ⚠️ git pull失败，继续检查
[2026-03-23 19:45:33] pangtong 无新任务