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

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

Browse Source
This commit is contained in:
cfdaily
2026-03-23 19:46:30 +08:00
parent 8cd8d62dae
commit dcdfe41941
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
@@ -6049,3 +6049,21 @@ to recover.
[2026-03-23 19:45:58] ⚠️ git pull失败，继续检查
[2026-03-23 19:45:58] ⚠️ git pull失败，继续检查
[2026-03-23 19:45:58] 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 eb4161ad35ec9d4d930e351237e08f59c6e0634b.
error: The following untracked working tree files would be overwritten by merge:
management/tasks/pending/TASK-20260323194629.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 eb4161ad35ec9d4d930e351237e08f59c6e0634b
output, run
$ git reset --hard
to recover.
[2026-03-23 19:46:29] ⚠️ git pull失败，继续检查
[2026-03-23 19:46:29] ⚠️ git pull失败，继续检查
[2026-03-23 19:46:29] zhangfei 无新任务