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

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

Browse Source
This commit is contained in:
cfdaily
2026-03-23 18:49:13 +08:00
parent f3ec850e78
commit dd4bdd3aa6
2 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zhangfei_monitor.log
+19
View File
@@ -4618,3 +4618,22 @@ to recover.
[2026-03-23 18:48:41] ⚠️ git pull失败，继续检查
[2026-03-23 18:48:41] ⚠️ git pull失败，继续检查
[2026-03-23 18:48:41] 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 65f7b53bbe273f197225d86029d1977511a98ed1.
error: Your local changes to the following files would be overwritten by merge:
guanyu_monitor.log
zhaoyun_monitor.log
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 65f7b53bbe273f197225d86029d1977511a98ed1
output, run
$ git reset --hard
to recover.
[2026-03-23 18:49:12] ⚠️ git pull失败，继续检查
[2026-03-23 18:49:12] ⚠️ git pull失败，继续检查
[2026-03-23 18:49:12] zhangfei 无新任务