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

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

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