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

fix: 修改git pull方式为普通pull，修复自动stash

Browse Source
This commit is contained in:
cfdaily
2026-03-23 17:34:50 +08:00
parent c59327e64d
commit 012c38c5fa
12 changed files with 103 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simayi_monitor.log
+22
View File
@@ -1404,3 +1404,25 @@ Already up to date.
[2026-03-23 17:31:55] ✅ git pull成功
[2026-03-23 17:31:55] ✅ git pull成功
[2026-03-23 17:31:55] simayi 无新任务
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 15fc81fa429e8efdb7ba256feaf803a52dec6738.
error: The following untracked working tree files would be overwritten by merge:
management/tasks/pending/TASK-20260323173423.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 15fc81fa429e8efdb7ba256feaf803a52dec6738
output, run
$ git reset --hard
to recover.
[2026-03-23 17:34:24] ⚠️ git pull失败，继续检查
[2026-03-23 17:34:24] simayi 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 17:34:29] ✅ git pull成功
[2026-03-23 17:34:29] simayi 无新任务