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

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

Browse Source
This commit is contained in:
cfdaily
2026-03-23 18:50:45 +08:00
parent dd8568a83d
commit b948be9849
4 changed files with 52 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zhaoyun_monitor.log
+19
View File
@@ -4647,3 +4647,22 @@ to recover.
[2026-03-23 18:50:13] zhaoyun 无新任务
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 15379bc75085f02a047a2f72d38d1287a7ef3cb4.
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-20260323185044.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 15379bc75085f02a047a2f72d38d1287a7ef3cb4
output, run
$ git reset --hard
to recover.
[2026-03-23 18:50:44] ⚠️ git pull失败，继续检查
[2026-03-23 18:50:44] ⚠️ git pull失败，继续检查
[2026-03-23 18:50:44] zhaoyun 无新任务