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

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

Browse Source
This commit is contained in:
cfdaily
2026-03-23 19:49:35 +08:00
parent 6fd2e2fb48
commit 0edf774df1
1 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zhangfei_monitor.log
+18
View File
@@ -6145,3 +6145,21 @@ Already up to date.
[2026-03-23 19:49:04] ✅ git pull成功
[2026-03-23 19:49:04] ✅ git pull成功
[2026-03-23 19:49:04] 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 dc3de11df061343e844e956dcf9465fba2a1629b.
error: The following untracked working tree files would be overwritten by merge:
management/tasks/pending/TASK-20260323194935.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 dc3de11df061343e844e956dcf9465fba2a1629b
output, run
$ git reset --hard
to recover.
[2026-03-23 19:49:34] ⚠️ git pull失败，继续检查
[2026-03-23 19:49:34] ⚠️ git pull失败，继续检查
[2026-03-23 19:49:34] zhangfei 无新任务