sync: 自动同步未提交变更 [create TASK-20260323190337]
This commit is contained in:
@@ -6358,3 +6358,24 @@ to recover.
|
|||||||
[2026-03-23 19:03:05] ⚠️ git pull失败,继续检查
|
[2026-03-23 19:03:05] ⚠️ git pull失败,继续检查
|
||||||
[2026-03-23 19:03:05] ⚠️ git pull失败,继续检查
|
[2026-03-23 19:03:05] ⚠️ git pull失败,继续检查
|
||||||
[2026-03-23 19:03:05] guanyu 无新任务
|
[2026-03-23 19:03:05] 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 5a9073f3b6252b09ecb804bdbb64d20c435c061b.
|
||||||
|
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-20260323190336.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 5a9073f3b6252b09ecb804bdbb64d20c435c061b
|
||||||
|
output, run
|
||||||
|
$ git reset --hard
|
||||||
|
to recover.
|
||||||
|
[2026-03-23 19:03:36] ⚠️ git pull失败,继续检查
|
||||||
|
[2026-03-23 19:03:36] ⚠️ git pull失败,继续检查
|
||||||
|
[2026-03-23 19:03:36] guanyu 无新任务
|
||||||
|
|||||||
@@ -0,0 +1,6 @@
|
|||||||
|
# 任务ID: TASK-20260323190337
|
||||||
|
# 状态: pending
|
||||||
|
# 创建时间: Mon Mar 23 19:03:37 CST 2026
|
||||||
|
|
||||||
|
## 任务需求
|
||||||
|
压力测试 19:03:37: 持续稳定性测试,验证系统在连续负载下的git容错处理
|
||||||
@@ -4965,3 +4965,9 @@ to recover.
|
|||||||
[2026-03-23 19:03:04] zhaoyun 无新任务
|
[2026-03-23 19:03:04] zhaoyun 无新任务
|
||||||
From gitee.com:cfdaily/sanguo_quant_live
|
From gitee.com:cfdaily/sanguo_quant_live
|
||||||
* branch main -> FETCH_HEAD
|
* 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 19:03:35] ⚠️ git pull失败,继续检查
|
||||||
|
[2026-03-23 19:03:35] ⚠️ git pull失败,继续检查
|
||||||
|
[2026-03-23 19:03:35] zhaoyun 无新任务
|
||||||
|
|||||||
Reference in New Issue
Block a user