fix: 修改git pull方式为普通pull,修复自动stash
This commit is contained in:
@@ -3544,3 +3544,8 @@ Already up to date.
|
|||||||
[2026-03-23 17:31:52] ✅ git pull成功
|
[2026-03-23 17:31:52] ✅ git pull成功
|
||||||
[2026-03-23 17:31:52] ✅ git pull成功
|
[2026-03-23 17:31:52] ✅ git pull成功
|
||||||
[2026-03-23 17:31:52] guanyu 无新任务
|
[2026-03-23 17:31:52] guanyu 无新任务
|
||||||
|
From gitee.com:cfdaily/sanguo_quant_live
|
||||||
|
* branch main -> FETCH_HEAD
|
||||||
|
Already up to date.
|
||||||
|
[2026-03-23 17:34:26] ✅ git pull成功
|
||||||
|
[2026-03-23 17:34:26] guanyu 无新任务
|
||||||
|
|||||||
@@ -2037,3 +2037,13 @@ Already up to date.
|
|||||||
[2026-03-23 17:31:56] ✅ git pull成功
|
[2026-03-23 17:31:56] ✅ git pull成功
|
||||||
[2026-03-23 17:31:56] ✅ git pull成功
|
[2026-03-23 17:31:56] ✅ git pull成功
|
||||||
[2026-03-23 17:31:56] jiangwei 无新任务
|
[2026-03-23 17:31:56] jiangwei 无新任务
|
||||||
|
From gitee.com:cfdaily/sanguo_quant_live
|
||||||
|
* branch main -> FETCH_HEAD
|
||||||
|
Already up to date.
|
||||||
|
[2026-03-23 17:34:25] ✅ git pull成功
|
||||||
|
[2026-03-23 17:34:25] jiangwei 无新任务
|
||||||
|
From gitee.com:cfdaily/sanguo_quant_live
|
||||||
|
* branch main -> FETCH_HEAD
|
||||||
|
Already up to date.
|
||||||
|
[2026-03-23 17:34:30] ✅ git pull成功
|
||||||
|
[2026-03-23 17:34:30] jiangwei 无新任务
|
||||||
|
|||||||
@@ -0,0 +1,15 @@
|
|||||||
|
# 自动化任务完成报告
|
||||||
|
- 任务ID: TASK-20260323173309
|
||||||
|
- 发现时间: 2026-03-23 17:33:22
|
||||||
|
- 执行Agent: pangtong
|
||||||
|
- 当前项目目录: /Users/chufeng/.openclaw/agents/main/workspace/projects/sanguo_quant_live
|
||||||
|
|
||||||
|
## 任务内容
|
||||||
|
# 任务ID: TASK-20260323173309
|
||||||
|
# 状态: pending
|
||||||
|
# 创建时间: Mon Mar 23 17:33:09 CST 2026
|
||||||
|
|
||||||
|
## 任务需求
|
||||||
|
【端到端冒烟测试】庞统副军师:验证任务接收,输出测试报告,确认工作流正常
|
||||||
|
|
||||||
|
✅ 监控自动发现任务成功,工作流正常
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
# 任务ID: TASK-20260323173423
|
||||||
|
# 状态: pending
|
||||||
|
# 创建时间: Mon Mar 23 17:34:23 CST 2026
|
||||||
|
|
||||||
|
## 任务需求
|
||||||
|
【端到端冒烟测试】张飞基建先锋:验证任务接收,检查文件结构,输出基础设施测试报告
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
# 任务ID: TASK-20260323173309
|
||||||
|
# 状态: assigned
|
||||||
|
# 创建时间: Mon Mar 23 17:33:09 CST 2026
|
||||||
|
|
||||||
|
## 任务需求
|
||||||
|
【端到端冒烟测试】庞统副军师:验证任务接收,输出测试报告,确认工作流正常
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
# 任务ID: TASK-20260323173423
|
||||||
|
# 状态: assigned
|
||||||
|
# 创建时间: Mon Mar 23 17:34:23 CST 2026
|
||||||
|
|
||||||
|
## 任务需求
|
||||||
|
【端到端冒烟测试】张飞基建先锋:验证任务接收,检查文件结构,输出基础设施测试报告
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
# 任务ID: TASK-20260323173237
|
||||||
|
# 状态: pending
|
||||||
|
# 创建时间: Mon Mar 23 17:32:37 CST 2026
|
||||||
|
|
||||||
|
## 任务需求
|
||||||
|
【端到端冒烟测试】庞统副军师:验证任务接收,输出测试报告,确认工作流正常
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
# 任务ID: TASK-20260323173345
|
||||||
|
# 状态: pending
|
||||||
|
# 创建时间: Mon Mar 23 17:33:45 CST 2026
|
||||||
|
|
||||||
|
## 任务需求
|
||||||
|
【端到端冒烟测试】张飞基建先锋:验证任务接收,检查文件结构,输出基础设施测试报告
|
||||||
@@ -3360,3 +3360,10 @@ Already up to date.
|
|||||||
[2026-03-23 17:31:50] ✅ git pull成功
|
[2026-03-23 17:31:50] ✅ git pull成功
|
||||||
[2026-03-23 17:31:50] ✅ git pull成功
|
[2026-03-23 17:31:50] ✅ git pull成功
|
||||||
[2026-03-23 17:31:50] pangtong 无新任务
|
[2026-03-23 17:31:50] pangtong 无新任务
|
||||||
|
From gitee.com:cfdaily/sanguo_quant_live
|
||||||
|
* branch main -> FETCH_HEAD
|
||||||
|
There are no candidates for merging among the refs that you just fetched.
|
||||||
|
Generally this means that you provided a wildcard refspec which had no
|
||||||
|
matches on the remote end.
|
||||||
|
[2026-03-23 17:34:25] ⚠️ git pull失败,继续检查
|
||||||
|
[2026-03-23 17:34:25] pangtong 无新任务
|
||||||
|
|||||||
@@ -1404,3 +1404,25 @@ Already up to date.
|
|||||||
[2026-03-23 17:31:55] ✅ git pull成功
|
[2026-03-23 17:31:55] ✅ git pull成功
|
||||||
[2026-03-23 17:31:55] ✅ git pull成功
|
[2026-03-23 17:31:55] ✅ git pull成功
|
||||||
[2026-03-23 17:31:55] simayi 无新任务
|
[2026-03-23 17:31:55] 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 15fc81fa429e8efdb7ba256feaf803a52dec6738.
|
||||||
|
error: The following untracked working tree files would be overwritten by merge:
|
||||||
|
management/tasks/pending/TASK-20260323173423.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 15fc81fa429e8efdb7ba256feaf803a52dec6738
|
||||||
|
output, run
|
||||||
|
$ git reset --hard
|
||||||
|
to recover.
|
||||||
|
[2026-03-23 17:34:24] ⚠️ git pull失败,继续检查
|
||||||
|
[2026-03-23 17:34:24] simayi 无新任务
|
||||||
|
From gitee.com:cfdaily/sanguo_quant_live
|
||||||
|
* branch main -> FETCH_HEAD
|
||||||
|
Already up to date.
|
||||||
|
[2026-03-23 17:34:29] ✅ git pull成功
|
||||||
|
[2026-03-23 17:34:29] simayi 无新任务
|
||||||
|
|||||||
@@ -2964,3 +2964,10 @@ Already up to date.
|
|||||||
[2026-03-23 17:31:51] ✅ git pull成功
|
[2026-03-23 17:31:51] ✅ git pull成功
|
||||||
[2026-03-23 17:31:51] ✅ git pull成功
|
[2026-03-23 17:31:51] ✅ git pull成功
|
||||||
[2026-03-23 17:31:51] zhangfei 无新任务
|
[2026-03-23 17:31:51] zhangfei 无新任务
|
||||||
|
From gitee.com:cfdaily/sanguo_quant_live
|
||||||
|
* branch main -> FETCH_HEAD
|
||||||
|
There are no candidates for merging among the refs that you just fetched.
|
||||||
|
Generally this means that you provided a wildcard refspec which had no
|
||||||
|
matches on the remote end.
|
||||||
|
[2026-03-23 17:34:25] ⚠️ git pull失败,继续检查
|
||||||
|
[2026-03-23 17:34:25] zhangfei 无新任务
|
||||||
|
|||||||
@@ -2826,3 +2826,10 @@ Already up to date.
|
|||||||
[2026-03-23 17:31:53] ✅ git pull成功
|
[2026-03-23 17:31:53] ✅ git pull成功
|
||||||
[2026-03-23 17:31:53] ✅ git pull成功
|
[2026-03-23 17:31:53] ✅ git pull成功
|
||||||
[2026-03-23 17:31:53] zhaoyun 无新任务
|
[2026-03-23 17:31:53] zhaoyun 无新任务
|
||||||
|
[2026-03-23 17:34:23] ✅ git pull成功
|
||||||
|
[2026-03-23 17:34:23] zhaoyun 无新任务
|
||||||
|
From gitee.com:cfdaily/sanguo_quant_live
|
||||||
|
* branch main -> FETCH_HEAD
|
||||||
|
Already up to date.
|
||||||
|
[2026-03-23 17:34:28] ✅ git pull成功
|
||||||
|
[2026-03-23 17:34:28] zhaoyun 无新任务
|
||||||
|
|||||||
Reference in New Issue
Block a user