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

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

Browse Source
This commit is contained in:
cfdaily
2026-03-23 19:52:10 +08:00
parent 55c378d9ff
commit 4e0a904717
2 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zhangfei_monitor.log
+18
View File
@@ -6238,3 +6238,21 @@ to recover.
[2026-03-23 19:51:38] ⚠️ git pull失败，继续检查
[2026-03-23 19:51:38] ⚠️ git pull失败，继续检查
[2026-03-23 19:51:38] 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 4bea45fa0e92556746f212c6c861fb01984e50f6.
error: The following untracked working tree files would be overwritten by merge:
management/tasks/pending/TASK-20260323195209.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 4bea45fa0e92556746f212c6c861fb01984e50f6
output, run
$ git reset --hard
to recover.
[2026-03-23 19:52:09] ⚠️ git pull失败，继续检查
[2026-03-23 19:52:09] ⚠️ git pull失败，继续检查
[2026-03-23 19:52:09] zhangfei 无新任务