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

This commit is contained in:
cfdaily
2026-03-23 17:52:06 +08:00
parent 7d203fa7e9
commit 2c67d9d20f
5 changed files with 75 additions and 0 deletions
+24
View File
@@ -2363,3 +2363,27 @@ fatal: pathspec 'management/agents/simayi/TASK-20260323175143.task' did not matc
[main 4c2fbe6] auto: simayi 完成任务 TASK-20260323175143
1 file changed, 6 deletions(-)
delete mode 100644 management/agents/simayi/TASK-20260323175143.task
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 8423a0afc0754926ed6b449fbde2b7a9acd124a5.
error: Your local changes to the following files would be overwritten by merge:
management/agents/zhangfei/TASK-20260323175149.done
zhangfei_monitor.log
Please commit your changes or stash them before you merge.
error: The following untracked working tree files would be overwritten by merge:
management/agents/pangtong/TASK-20260323175204.task
management/tasks/assigned/TASK-20260323175204.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 8423a0afc0754926ed6b449fbde2b7a9acd124a5
output, run
$ git reset --hard
to recover.
[2026-03-23 17:52:04] ⚠️ git pull失败,继续检查
[2026-03-23 17:52:04] simayi 无新任务
remote: Powered by GITEE.COM [1.1.23]
remote: Set trace flag 13413591