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

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

Browse Source
This commit is contained in:
cfdaily
2026-03-23 19:06:12 +08:00
parent 518c3b2d98
commit 0e84640467
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
@@ -5231,3 +5231,22 @@ to recover.
[2026-03-23 19:05:40] ⚠️ git pull失败，继续检查
[2026-03-23 19:05:40] ⚠️ git pull失败，继续检查
[2026-03-23 19:05:40] 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 743c01c068db22d1578e985e904d749b9d24e099.
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 743c01c068db22d1578e985e904d749b9d24e099
output, run
$ git reset --hard
to recover.
[2026-03-23 19:06:11] ⚠️ git pull失败，继续检查
[2026-03-23 19:06:11] ⚠️ git pull失败，继续检查
[2026-03-23 19:06:11] zhangfei 无新任务