sync: 自动同步未提交变更 [assign TASK-20260323175132 to guanyu]

This commit is contained in:
cfdaily
2026-03-23 17:51:33 +08:00
parent f216a1f891
commit 01faf7d735
7 changed files with 166 additions and 0 deletions
+37
View File
@@ -2298,3 +2298,40 @@ may have crashed in this repository earlier:
remove the file manually to continue.
[2026-03-23 17:51:28] ✅ simayi 完成任务: TASK-20260323175115
[2026-03-23 17:51:28] 📝 完成标记已创建: management/agents/simayi/TASK-20260323175115.done
fatal: pathspec 'management/agents/simayi/TASK-20260323175115.task' did not match any files
[2026-03-23 17:51:28] 📤 正在推送完成结果...
On branch main
Your branch is ahead of 'origin/main' by 4 commits.
(use "git push" to publish your local commits)
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git restore <file>..." to discard changes in working directory)
modified: simayi_monitor.log
no changes added to commit (use "git add" and/or "git commit -a")
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 8c84462332f2ef0a804e60a38f3112f2683eecef.
error: Your local changes to the following files would be overwritten by merge:
simayi_monitor.log
zhangfei_monitor.log
zhaoyun_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/simayi/TASK-20260323175115.done
management/agents/zhaoyun/TASK-20260323175100.done
management/agents/zhaoyun/TASK-20260323175118.done
management/tasks/pending/TASK-20260323175132.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 8c84462332f2ef0a804e60a38f3112f2683eecef
output, run
$ git reset --hard
to recover.
[2026-03-23 17:51:31] ⚠️ git pull失败,继续检查
[2026-03-23 17:51:31] simayi 无新任务