feat: 添加删除任务给姜维 TASK-20260323232111
This commit is contained in:
@@ -10103,3 +10103,40 @@ Already up to date.
|
|||||||
[2026-03-23 23:20:49] ✅ git pull成功
|
[2026-03-23 23:20:49] ✅ git pull成功
|
||||||
[2026-03-23 23:20:49] ✅ git pull成功
|
[2026-03-23 23:20:49] ✅ git pull成功
|
||||||
[2026-03-23 23:20:49] guanyu 无新任务
|
[2026-03-23 23:20:49] guanyu 无新任务
|
||||||
|
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 a2c3ba6b0f0c8b3214e7939be2b05a16627b63f6.
|
||||||
|
error: The following untracked working tree files would be overwritten by merge:
|
||||||
|
management/agents/jiangwei/TASK-20260323232111.task
|
||||||
|
management/tasks/assigned/TASK-20260323232111.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 a2c3ba6b0f0c8b3214e7939be2b05a16627b63f6
|
||||||
|
output, run
|
||||||
|
$ git reset --hard
|
||||||
|
to recover.
|
||||||
|
[2026-03-23 23:21:19] ⚠️ git pull失败,继续检查
|
||||||
|
[2026-03-23 23:21:19] ⚠️ git pull失败,继续检查
|
||||||
|
[2026-03-23 23:21:19] guanyu 无新任务
|
||||||
|
From gitee.com:cfdaily/sanguo_quant_live
|
||||||
|
* branch main -> FETCH_HEAD
|
||||||
|
Already up to date.
|
||||||
|
[2026-03-23 23:21:50] ✅ git pull成功
|
||||||
|
[2026-03-23 23:21:50] ✅ git pull成功
|
||||||
|
[2026-03-23 23:21:50] guanyu 无新任务
|
||||||
|
From gitee.com:cfdaily/sanguo_quant_live
|
||||||
|
* branch main -> FETCH_HEAD
|
||||||
|
Already up to date.
|
||||||
|
[2026-03-23 23:22:21] ✅ git pull成功
|
||||||
|
[2026-03-23 23:22:21] ✅ git pull成功
|
||||||
|
[2026-03-23 23:22:21] guanyu 无新任务
|
||||||
|
From gitee.com:cfdaily/sanguo_quant_live
|
||||||
|
* branch main -> FETCH_HEAD
|
||||||
|
Already up to date.
|
||||||
|
[2026-03-23 23:22:52] ✅ git pull成功
|
||||||
|
[2026-03-23 23:22:52] ✅ git pull成功
|
||||||
|
[2026-03-23 23:22:52] guanyu 无新任务
|
||||||
|
|||||||
@@ -8861,3 +8861,27 @@ Already up to date.
|
|||||||
[2026-03-23 23:20:51] ✅ git pull成功
|
[2026-03-23 23:20:51] ✅ git pull成功
|
||||||
[2026-03-23 23:20:51] ✅ git pull成功
|
[2026-03-23 23:20:51] ✅ git pull成功
|
||||||
[2026-03-23 23:20:51] zhangfei 无新任务
|
[2026-03-23 23:20:51] zhangfei 无新任务
|
||||||
|
From gitee.com:cfdaily/sanguo_quant_live
|
||||||
|
* branch main -> FETCH_HEAD
|
||||||
|
Already up to date.
|
||||||
|
[2026-03-23 23:21:22] ✅ git pull成功
|
||||||
|
[2026-03-23 23:21:22] ✅ git pull成功
|
||||||
|
[2026-03-23 23:21:22] zhangfei 无新任务
|
||||||
|
From gitee.com:cfdaily/sanguo_quant_live
|
||||||
|
* branch main -> FETCH_HEAD
|
||||||
|
Already up to date.
|
||||||
|
[2026-03-23 23:21:53] ✅ git pull成功
|
||||||
|
[2026-03-23 23:21:53] ✅ git pull成功
|
||||||
|
[2026-03-23 23:21:53] zhangfei 无新任务
|
||||||
|
From gitee.com:cfdaily/sanguo_quant_live
|
||||||
|
* branch main -> FETCH_HEAD
|
||||||
|
Already up to date.
|
||||||
|
[2026-03-23 23:22:24] ✅ git pull成功
|
||||||
|
[2026-03-23 23:22:24] ✅ git pull成功
|
||||||
|
[2026-03-23 23:22:24] zhangfei 无新任务
|
||||||
|
From gitee.com:cfdaily/sanguo_quant_live
|
||||||
|
* branch main -> FETCH_HEAD
|
||||||
|
Already up to date.
|
||||||
|
[2026-03-23 23:22:55] ✅ git pull成功
|
||||||
|
[2026-03-23 23:22:55] ✅ git pull成功
|
||||||
|
[2026-03-23 23:22:55] zhangfei 无新任务
|
||||||
|
|||||||
@@ -8670,3 +8670,40 @@ Already up to date.
|
|||||||
[2026-03-23 23:20:49] ✅ git pull成功
|
[2026-03-23 23:20:49] ✅ git pull成功
|
||||||
[2026-03-23 23:20:49] ✅ git pull成功
|
[2026-03-23 23:20:49] ✅ git pull成功
|
||||||
[2026-03-23 23:20:49] zhaoyun 无新任务
|
[2026-03-23 23:20:49] 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 a2c3ba6b0f0c8b3214e7939be2b05a16627b63f6.
|
||||||
|
error: The following untracked working tree files would be overwritten by merge:
|
||||||
|
management/agents/jiangwei/TASK-20260323232111.task
|
||||||
|
management/tasks/assigned/TASK-20260323232111.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 a2c3ba6b0f0c8b3214e7939be2b05a16627b63f6
|
||||||
|
output, run
|
||||||
|
$ git reset --hard
|
||||||
|
to recover.
|
||||||
|
[2026-03-23 23:21:19] ⚠️ git pull失败,继续检查
|
||||||
|
[2026-03-23 23:21:19] ⚠️ git pull失败,继续检查
|
||||||
|
[2026-03-23 23:21:19] zhaoyun 无新任务
|
||||||
|
From gitee.com:cfdaily/sanguo_quant_live
|
||||||
|
* branch main -> FETCH_HEAD
|
||||||
|
Already up to date.
|
||||||
|
[2026-03-23 23:21:50] ✅ git pull成功
|
||||||
|
[2026-03-23 23:21:50] ✅ git pull成功
|
||||||
|
[2026-03-23 23:21:50] zhaoyun 无新任务
|
||||||
|
From gitee.com:cfdaily/sanguo_quant_live
|
||||||
|
* branch main -> FETCH_HEAD
|
||||||
|
Already up to date.
|
||||||
|
[2026-03-23 23:22:21] ✅ git pull成功
|
||||||
|
[2026-03-23 23:22:21] ✅ git pull成功
|
||||||
|
[2026-03-23 23:22:21] zhaoyun 无新任务
|
||||||
|
From gitee.com:cfdaily/sanguo_quant_live
|
||||||
|
* branch main -> FETCH_HEAD
|
||||||
|
Already up to date.
|
||||||
|
[2026-03-23 23:22:52] ✅ git pull成功
|
||||||
|
[2026-03-23 23:22:52] ✅ git pull成功
|
||||||
|
[2026-03-23 23:22:52] zhaoyun 无新任务
|
||||||
|
|||||||
Reference in New Issue
Block a user