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

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

Browse Source
This commit is contained in:
cfdaily
2026-03-23 18:48:18 +08:00
parent bb226ab745
commit bbcfa5b3ca
2 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pangtong_monitor.log
+17
View File
@@ -5478,3 +5478,20 @@ From gitee.com:cfdaily/sanguo_quant_live
Already up to date.
[2026-03-23 18:47:46] ✅ git pull成功
[2026-03-23 18:47:46] pangtong 无新任务
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 c942f34bf00b00b1631090f610a60062fa1d9e1e.
error: The following untracked working tree files would be overwritten by merge:
management/tasks/pending/TASK-20260323184817.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 c942f34bf00b00b1631090f610a60062fa1d9e1e
output, run
$ git reset --hard
to recover.
[2026-03-23 18:48:17] ⚠️ git pull失败，继续检查
[2026-03-23 18:48:17] pangtong 无新任务