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

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

Browse Source
This commit is contained in:
cfdaily
2026-03-23 19:13:57 +08:00
parent 07e5196bcb
commit deb4a4f09b
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
@@ -5522,3 +5522,21 @@ to recover.
[2026-03-23 19:13:25] ⚠️ git pull失败，继续检查
[2026-03-23 19:13:25] ⚠️ git pull失败，继续检查
[2026-03-23 19:13:25] 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 90a2e47d0b9269434c3503e8133c8f26ec6deda7.
error: Your local changes to the following files would be overwritten by merge:
management/tasks/pending/TASK-20260323191356.md
Please commit your changes or stash them before you merge.
Aborting
fatal: Cannot fast-forward your working tree.
After making sure that you saved anything precious from
$ git diff 90a2e47d0b9269434c3503e8133c8f26ec6deda7
output, run
$ git reset --hard
to recover.
[2026-03-23 19:13:56] ⚠️ git pull失败，继续检查
[2026-03-23 19:13:56] ⚠️ git pull失败，继续检查
[2026-03-23 19:13:56] zhangfei 无新任务