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

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

Browse Source
This commit is contained in:
cfdaily
2026-03-23 19:17:40 +08:00
parent 010eb0b558
commit 2b1b42ca09
2 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pangtong_monitor.log
+17
View File
@@ -6335,3 +6335,20 @@ $ git reset --hard
to recover.
[2026-03-23 19:17:08] ⚠️ git pull失败，继续检查
[2026-03-23 19:17:08] 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 61cdbd2103cabd7a78308febec3913f111844449.
error: The following untracked working tree files would be overwritten by merge:
management/tasks/pending/TASK-20260323191739.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 61cdbd2103cabd7a78308febec3913f111844449
output, run
$ git reset --hard
to recover.
[2026-03-23 19:17:39] ⚠️ git pull失败，继续检查
[2026-03-23 19:17:39] pangtong 无新任务