sync: 自动同步未提交变更 [create TASK-20260323185656]
This commit is contained in:
@@ -6130,3 +6130,24 @@ to recover.
|
||||
[2026-03-23 18:56:23] ⚠️ git pull失败,继续检查
|
||||
[2026-03-23 18:56:23] ⚠️ git pull失败,继续检查
|
||||
[2026-03-23 18:56:23] 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 d1df82820c337cc9b93306de8233573f15fc9e05.
|
||||
error: Your local changes to the following files would be overwritten by merge:
|
||||
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-20260323185655.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 d1df82820c337cc9b93306de8233573f15fc9e05
|
||||
output, run
|
||||
$ git reset --hard
|
||||
to recover.
|
||||
[2026-03-23 18:56:54] ⚠️ git pull失败,继续检查
|
||||
[2026-03-23 18:56:54] ⚠️ git pull失败,继续检查
|
||||
[2026-03-23 18:56:54] guanyu 无新任务
|
||||
|
||||
@@ -0,0 +1,6 @@
|
||||
# 任务ID: TASK-20260323185656
|
||||
# 状态: pending
|
||||
# 创建时间: Mon Mar 23 18:56:56 CST 2026
|
||||
|
||||
## 任务需求
|
||||
压力测试 18:56:56: 持续稳定性测试,验证系统在连续负载下的git容错处理
|
||||
@@ -4847,3 +4847,24 @@ to recover.
|
||||
[2026-03-23 18:56:24] ⚠️ git pull失败,继续检查
|
||||
[2026-03-23 18:56:24] ⚠️ git pull失败,继续检查
|
||||
[2026-03-23 18:56:24] 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 d1df82820c337cc9b93306de8233573f15fc9e05.
|
||||
error: Your local changes to the following files would be overwritten by merge:
|
||||
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-20260323185655.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 d1df82820c337cc9b93306de8233573f15fc9e05
|
||||
output, run
|
||||
$ git reset --hard
|
||||
to recover.
|
||||
[2026-03-23 18:56:55] ⚠️ git pull失败,继续检查
|
||||
[2026-03-23 18:56:55] ⚠️ git pull失败,继续检查
|
||||
[2026-03-23 18:56:55] zhangfei 无新任务
|
||||
|
||||
Reference in New Issue
Block a user