sync: 自动同步未提交变更 [create TASK-20260323185045]
This commit is contained in:
@@ -5956,3 +5956,24 @@ to recover.
|
||||
[2026-03-23 18:50:13] ⚠️ git pull失败,继续检查
|
||||
[2026-03-23 18:50:13] ⚠️ git pull失败,继续检查
|
||||
[2026-03-23 18:50:13] 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 15379bc75085f02a047a2f72d38d1287a7ef3cb4.
|
||||
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-20260323185044.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 15379bc75085f02a047a2f72d38d1287a7ef3cb4
|
||||
output, run
|
||||
$ git reset --hard
|
||||
to recover.
|
||||
[2026-03-23 18:50:44] ⚠️ git pull失败,继续检查
|
||||
[2026-03-23 18:50:44] ⚠️ git pull失败,继续检查
|
||||
[2026-03-23 18:50:44] guanyu 无新任务
|
||||
|
||||
@@ -0,0 +1,6 @@
|
||||
# 任务ID: TASK-20260323185045
|
||||
# 状态: pending
|
||||
# 创建时间: Mon Mar 23 18:50:45 CST 2026
|
||||
|
||||
## 任务需求
|
||||
压力测试 18:50:45: 持续稳定性测试,验证系统在连续负载下的git容错处理
|
||||
@@ -4649,3 +4649,9 @@ Already up to date.
|
||||
[2026-03-23 18:50:13] ✅ git pull成功
|
||||
[2026-03-23 18:50:13] ✅ git pull成功
|
||||
[2026-03-23 18:50:13] zhangfei 无新任务
|
||||
From gitee.com:cfdaily/sanguo_quant_live
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
[2026-03-23 18:50:44] ✅ git pull成功
|
||||
[2026-03-23 18:50:44] ✅ git pull成功
|
||||
[2026-03-23 18:50:44] zhangfei 无新任务
|
||||
|
||||
@@ -4647,3 +4647,22 @@ to recover.
|
||||
[2026-03-23 18:50:13] 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 15379bc75085f02a047a2f72d38d1287a7ef3cb4.
|
||||
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-20260323185044.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 15379bc75085f02a047a2f72d38d1287a7ef3cb4
|
||||
output, run
|
||||
$ git reset --hard
|
||||
to recover.
|
||||
[2026-03-23 18:50:44] ⚠️ git pull失败,继续检查
|
||||
[2026-03-23 18:50:44] ⚠️ git pull失败,继续检查
|
||||
[2026-03-23 18:50:44] zhaoyun 无新任务
|
||||
|
||||
Reference in New Issue
Block a user