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

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

Browse Source
This commit is contained in:
cfdaily
2026-03-23 18:52:18 +08:00
parent d281c3112b
commit bb075816a5
1 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zhangfei_monitor.log
+22
View File
@@ -4683,3 +4683,25 @@ to recover.
[2026-03-23 18:51:46] ⚠️ git pull失败，继续检查
[2026-03-23 18:51:46] ⚠️ git pull失败，继续检查
[2026-03-23 18:51:46] 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 62304395e5aa40e2ddc2f986cc5987cc336f471e.
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.
error: The following untracked working tree files would be overwritten by merge:
management/tasks/pending/TASK-20260323185218.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 62304395e5aa40e2ddc2f986cc5987cc336f471e
output, run
$ git reset --hard
to recover.
[2026-03-23 18:52:17] ⚠️ git pull失败，继续检查
[2026-03-23 18:52:17] ⚠️ git pull失败，继续检查
[2026-03-23 18:52:17] zhangfei 无新任务