sync: 自动同步未提交变更 [create TASK-20260323190611]
This commit is contained in:
@@ -6445,3 +6445,21 @@ to recover.
|
|||||||
[2026-03-23 19:05:40] ⚠️ git pull失败,继续检查
|
[2026-03-23 19:05:40] ⚠️ git pull失败,继续检查
|
||||||
[2026-03-23 19:05:40] ⚠️ git pull失败,继续检查
|
[2026-03-23 19:05:40] ⚠️ git pull失败,继续检查
|
||||||
[2026-03-23 19:05:40] guanyu 无新任务
|
[2026-03-23 19:05:40] 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 8c5d0ce0c0ea9f8d5b9b51680427214756cbbae6.
|
||||||
|
error: The following untracked working tree files would be overwritten by merge:
|
||||||
|
management/tasks/pending/TASK-20260323190611.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 8c5d0ce0c0ea9f8d5b9b51680427214756cbbae6
|
||||||
|
output, run
|
||||||
|
$ git reset --hard
|
||||||
|
to recover.
|
||||||
|
[2026-03-23 19:06:11] ⚠️ git pull失败,继续检查
|
||||||
|
[2026-03-23 19:06:11] ⚠️ git pull失败,继续检查
|
||||||
|
[2026-03-23 19:06:11] guanyu 无新任务
|
||||||
|
|||||||
@@ -5043,3 +5043,21 @@ to recover.
|
|||||||
[2026-03-23 19:05:39] ⚠️ git pull失败,继续检查
|
[2026-03-23 19:05:39] ⚠️ git pull失败,继续检查
|
||||||
[2026-03-23 19:05:39] ⚠️ git pull失败,继续检查
|
[2026-03-23 19:05:39] ⚠️ git pull失败,继续检查
|
||||||
[2026-03-23 19:05:39] zhaoyun 无新任务
|
[2026-03-23 19:05:39] 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 8c5d0ce0c0ea9f8d5b9b51680427214756cbbae6.
|
||||||
|
error: The following untracked working tree files would be overwritten by merge:
|
||||||
|
management/tasks/pending/TASK-20260323190611.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 8c5d0ce0c0ea9f8d5b9b51680427214756cbbae6
|
||||||
|
output, run
|
||||||
|
$ git reset --hard
|
||||||
|
to recover.
|
||||||
|
[2026-03-23 19:06:10] ⚠️ git pull失败,继续检查
|
||||||
|
[2026-03-23 19:06:10] ⚠️ git pull失败,继续检查
|
||||||
|
[2026-03-23 19:06:10] zhaoyun 无新任务
|
||||||
|
|||||||
Reference in New Issue
Block a user