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

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

Browse Source
This commit is contained in:
cfdaily
2026-03-23 19:43:53 +08:00
parent 7dc4494209
commit beefb5a880
2 changed files with 39 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zhaoyun_monitor.log
+18
View File
@@ -5751,3 +5751,21 @@ to recover.
[2026-03-23 19:43:21] ⚠️ git pull失败，继续检查
[2026-03-23 19:43:21] ⚠️ git pull失败，继续检查
[2026-03-23 19:43:21] zhaoyun 无新任务
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 611a7be92c07ceb1417fe92fd293586e3194d28f.
error: The following untracked working tree files would be overwritten by merge:
management/tasks/pending/TASK-20260323194353.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 611a7be92c07ceb1417fe92fd293586e3194d28f
output, run
$ git reset --hard
to recover.
[2026-03-23 19:43:52] ⚠️ git pull失败，继续检查
[2026-03-23 19:43:52] ⚠️ git pull失败，继续检查
[2026-03-23 19:43:52] zhaoyun 无新任务