sync: 自动同步未提交变更 [create TASK-20260323190644]
This commit is contained in:
@@ -0,0 +1,6 @@
|
|||||||
|
# 任务ID: TASK-20260323190644
|
||||||
|
# 状态: pending
|
||||||
|
# 创建时间: Mon Mar 23 19:06:44 CST 2026
|
||||||
|
|
||||||
|
## 任务需求
|
||||||
|
压力测试 19:06:44: 持续稳定性测试,验证系统在连续负载下的git容错处理
|
||||||
@@ -5252,3 +5252,23 @@ to recover.
|
|||||||
[2026-03-23 19:06:11] zhangfei 无新任务
|
[2026-03-23 19:06:11] zhangfei 无新任务
|
||||||
From gitee.com:cfdaily/sanguo_quant_live
|
From gitee.com:cfdaily/sanguo_quant_live
|
||||||
* branch main -> FETCH_HEAD
|
* branch main -> FETCH_HEAD
|
||||||
|
warning: fetch updated the current branch head.
|
||||||
|
fast-forwarding your working tree from
|
||||||
|
commit 04c18bcc690a36f6261c10f28d79076ba2c0bb64.
|
||||||
|
error: Your local changes to the following files would be overwritten by merge:
|
||||||
|
guanyu_monitor.log
|
||||||
|
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/tasks/pending/TASK-20260323190643.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 04c18bcc690a36f6261c10f28d79076ba2c0bb64
|
||||||
|
output, run
|
||||||
|
$ git reset --hard
|
||||||
|
to recover.
|
||||||
|
[2026-03-23 19:06:42] ⚠️ git pull失败,继续检查
|
||||||
|
[2026-03-23 19:06:42] ⚠️ git pull失败,继续检查
|
||||||
|
[2026-03-23 19:06:42] zhangfei 无新任务
|
||||||
|
|||||||
Reference in New Issue
Block a user