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

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

Browse Source
This commit is contained in:
cfdaily
2026-03-23 17:51:03 +08:00
parent eb9d145258
commit 3ba9e15018
5 changed files with 116 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simayi_monitor.log
+23
View File
@@ -2219,3 +2219,26 @@ $ git reset --hard
to recover.
[2026-03-23 17:50:57] ⚠️ git pull失败，继续检查
[2026-03-23 17:50:57] simayi 无新任务
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 8cc0e2e80e5e3c6bf3fb087837a68e2f173d8b7c.
error: Your local changes to the following files would be overwritten by merge:
guanyu_monitor.log
jiangwei_monitor.log
management/agents/guanyu/TASK-20260323175044.done
Please commit your changes or stash them before you merge.
error: The following untracked working tree files would be overwritten by merge:
management/agents/zhaoyun/TASK-20260323175100.task
management/tasks/assigned/TASK-20260323175100.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 8cc0e2e80e5e3c6bf3fb087837a68e2f173d8b7c
output, run
$ git reset --hard
to recover.
[2026-03-23 17:51:00] ⚠️ git pull失败，继续检查
[2026-03-23 17:51:00] simayi 无新任务