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

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

Browse Source
This commit is contained in:
cfdaily
2026-03-23 19:11:23 +08:00
parent b579ea63f9
commit f6e63e88fe
2 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zhangfei_monitor.log
+18
View File
@@ -5432,3 +5432,21 @@ to recover.
[2026-03-23 19:10:50] ⚠️ git pull失败，继续检查
[2026-03-23 19:10:50] ⚠️ git pull失败，继续检查
[2026-03-23 19:10:50] zhangfei 无新任务
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 d2b8eedeae9418714a7f76b55a2a57fb83e605b3.
error: The following untracked working tree files would be overwritten by merge:
management/tasks/pending/TASK-20260323191122.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 d2b8eedeae9418714a7f76b55a2a57fb83e605b3
output, run
$ git reset --hard
to recover.
[2026-03-23 19:11:21] ⚠️ git pull失败，继续检查
[2026-03-23 19:11:21] ⚠️ git pull失败，继续检查
[2026-03-23 19:11:21] zhangfei 无新任务