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

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

Browse Source
This commit is contained in:
cfdaily
2026-03-23 19:17:34 +08:00
parent 04d0e88201
commit 3bf2f5c7da
2 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zhangfei_monitor.log
+18
View File
@@ -5648,3 +5648,21 @@ to recover.
[2026-03-23 19:17:02] ⚠️ git pull失败，继续检查
[2026-03-23 19:17:02] ⚠️ git pull失败，继续检查
[2026-03-23 19:17:02] 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 0bca1aa2f1bd7a81d7843a9acde668edeb993017.
error: The following untracked working tree files would be overwritten by merge:
management/tasks/pending/TASK-20260323191733.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 0bca1aa2f1bd7a81d7843a9acde668edeb993017
output, run
$ git reset --hard
to recover.
[2026-03-23 19:17:33] ⚠️ git pull失败，继续检查
[2026-03-23 19:17:33] ⚠️ git pull失败，继续检查
[2026-03-23 19:17:33] zhangfei 无新任务