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

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

Browse Source
This commit is contained in:
cfdaily
2026-03-23 18:53:50 +08:00
parent e3cf62ae41
commit d5fd8e765f
2 changed files with 42 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
guanyu_monitor.log
+21
View File
@@ -6046,3 +6046,24 @@ Already up to date.
[2026-03-23 18:53:18] ✅ git pull成功 [2026-03-23 18:53:18] ✅ git pull成功
[2026-03-23 18:53:18] ✅ git pull成功 [2026-03-23 18:53:18] ✅ git pull成功
[2026-03-23 18:53:18] guanyu 无新任务 [2026-03-23 18:53:18] 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 5a96b0d85462f4b909b1904b8dd74daaea00616a.
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-20260323185350.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 5a96b0d85462f4b909b1904b8dd74daaea00616a
output, run
$ git reset --hard
to recover.
[2026-03-23 18:53:49] ⚠️ git pull失败，继续检查
[2026-03-23 18:53:49] ⚠️ git pull失败，继续检查
[2026-03-23 18:53:49] guanyu 无新任务
zhangfei_monitor.log
+21
View File
@@ -4733,3 +4733,24 @@ to recover.
[2026-03-23 18:53:19] ⚠️ git pull失败，继续检查 [2026-03-23 18:53:19] ⚠️ git pull失败，继续检查
[2026-03-23 18:53:19] ⚠️ git pull失败，继续检查 [2026-03-23 18:53:19] ⚠️ git pull失败，继续检查
[2026-03-23 18:53:19] zhangfei 无新任务 [2026-03-23 18:53:19] 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 5a96b0d85462f4b909b1904b8dd74daaea00616a.
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-20260323185350.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 5a96b0d85462f4b909b1904b8dd74daaea00616a
output, run
$ git reset --hard
to recover.
[2026-03-23 18:53:50] ⚠️ git pull失败，继续检查
[2026-03-23 18:53:50] ⚠️ git pull失败，继续检查
[2026-03-23 18:53:50] zhangfei 无新任务