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

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

Browse Source
This commit is contained in:
cfdaily
2026-03-23 18:57:57 +08:00
parent 3e85b3a4c0
commit 51d372f620
3 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zhaoyun_monitor.log
+18
View File
@@ -4807,3 +4807,21 @@ Already up to date.
[2026-03-23 18:57:25] ✅ git pull成功
[2026-03-23 18:57:25] ✅ git pull成功
[2026-03-23 18:57:25] 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 571cef915217d84669eca2b5b7deaa9e90dddacd.
error: The following untracked working tree files would be overwritten by merge:
management/tasks/pending/TASK-20260323185756.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 571cef915217d84669eca2b5b7deaa9e90dddacd
output, run
$ git reset --hard
to recover.
[2026-03-23 18:57:56] ⚠️ git pull失败，继续检查
[2026-03-23 18:57:56] ⚠️ git pull失败，继续检查
[2026-03-23 18:57:56] zhaoyun 无新任务