sync: 自动同步未提交变更 [create TASK-20260323185758]
This commit is contained in:
@@ -6159,3 +6159,7 @@ Already up to date.
|
||||
[2026-03-23 18:57:25] guanyu 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 18:57:56] ✅ git pull成功
|
||||
[2026-03-23 18:57:56] ✅ git pull成功
|
||||
[2026-03-23 18:57:56] guanyu 无新任务
|
||||
|
||||
@@ -0,0 +1,6 @@
|
||||
# 任务ID: TASK-20260323185758
|
||||
# 状态: pending
|
||||
# 创建时间: Mon Mar 23 18:57:58 CST 2026
|
||||
|
||||
## 任务需求
|
||||
压力测试 18:57:58: 持续稳定性测试,验证系统在连续负载下的git容错处理
|
||||
@@ -4890,3 +4890,25 @@ to recover.
|
||||
[2026-03-23 18:57:26] ⚠️ git pull失败,继续检查
|
||||
[2026-03-23 18:57:26] ⚠️ git pull失败,继续检查
|
||||
[2026-03-23 18:57:26] zhangfei 无新任务
|
||||
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 3e85b3a4c0825b3c39a2a310e487a478c68e5c6e.
|
||||
error: Your local changes to the following files would be overwritten by merge:
|
||||
guanyu_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/tasks/pending/TASK-20260323185757.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 3e85b3a4c0825b3c39a2a310e487a478c68e5c6e
|
||||
output, run
|
||||
$ git reset --hard
|
||||
to recover.
|
||||
[2026-03-23 18:57:56] ⚠️ git pull失败,继续检查
|
||||
[2026-03-23 18:57:56] ⚠️ git pull失败,继续检查
|
||||
[2026-03-23 18:57:56] zhangfei 无新任务
|
||||
|
||||
Reference in New Issue
Block a user