sanguo/sanguo_quant_live
8
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sync: 自动同步未提交变更 [create TASK-20260323194556]

Browse Source
This commit is contained in:
cfdaily
2026-03-23 19:45:57 +08:00
parent 50cfd591e8
commit 837f801a21
2 changed files with 36 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
guanyu_monitor.log
+18
View File
@@ -7286,3 +7286,21 @@ to recover.
[2026-03-23 19:45:25] ⚠️ git pull失败，继续检查
[2026-03-23 19:45:25] ⚠️ git pull失败，继续检查
[2026-03-23 19:45:25] 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 29062eb895557398468382c9373fe257e1e33324.
error: The following untracked working tree files would be overwritten by merge:
management/tasks/pending/TASK-20260323194556.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 29062eb895557398468382c9373fe257e1e33324
output, run
$ git reset --hard
to recover.
[2026-03-23 19:45:56] ⚠️ git pull失败，继续检查
[2026-03-23 19:45:56] ⚠️ git pull失败，继续检查
[2026-03-23 19:45:56] guanyu 无新任务
zhaoyun_monitor.log
+18
View File
@@ -5826,3 +5826,21 @@ to recover.
[2026-03-23 19:45:25] ⚠️ git pull失败，继续检查
[2026-03-23 19:45:25] ⚠️ git pull失败，继续检查
[2026-03-23 19:45:25] 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 29062eb895557398468382c9373fe257e1e33324.
error: The following untracked working tree files would be overwritten by merge:
management/tasks/pending/TASK-20260323194556.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 29062eb895557398468382c9373fe257e1e33324
output, run
$ git reset --hard
to recover.
[2026-03-23 19:45:56] ⚠️ git pull失败，继续检查
[2026-03-23 19:45:56] ⚠️ git pull失败，继续检查
[2026-03-23 19:45:56] zhaoyun 无新任务