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

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

Browse Source
This commit is contained in:
cfdaily
2026-03-23 19:05:42 +08:00
parent 84686cc306
commit 872e8b7cf2
2 changed files with 27 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zhangfei_monitor.log
+21
View File
@@ -5210,3 +5210,24 @@ to recover.
[2026-03-23 19:05:09] ⚠️ git pull失败，继续检查
[2026-03-23 19:05:09] ⚠️ git pull失败，继续检查
[2026-03-23 19:05:09] 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 4afdccd29f79e4a217577650317f642339768482.
error: Your local changes to the following files would be overwritten by merge:
guanyu_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-20260323190541.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 4afdccd29f79e4a217577650317f642339768482
output, run
$ git reset --hard
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 无新任务