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

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

Browse Source
This commit is contained in:
cfdaily
2026-03-23 19:03:37 +08:00
parent e861d3e498
commit 3fa2beea7f
3 changed files with 33 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
guanyu_monitor.log
+21
View File
@@ -6358,3 +6358,24 @@ to recover.
[2026-03-23 19:03:05] ⚠️ git pull失败，继续检查
[2026-03-23 19:03:05] ⚠️ git pull失败，继续检查
[2026-03-23 19:03:05] guanyu 无新任务
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 5a9073f3b6252b09ecb804bdbb64d20c435c061b.
error: Your local changes to the following files would be overwritten by merge:
zhaoyun_monitor.log
Please commit your changes or stash them before you merge.
error: The following untracked working tree files would be overwritten by merge:
management/tasks/pending/TASK-20260323190336.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 5a9073f3b6252b09ecb804bdbb64d20c435c061b
output, run
$ git reset --hard
to recover.
[2026-03-23 19:03:36] ⚠️ git pull失败，继续检查
[2026-03-23 19:03:36] ⚠️ git pull失败，继续检查
[2026-03-23 19:03:36] guanyu 无新任务