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

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

Browse Source
This commit is contained in:
cfdaily
2026-03-23 18:48:24 +08:00
parent d8671e379f
commit a5dd8d3918
2 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simayi_monitor.log
+18
View File
@@ -113,3 +113,21 @@ Already up to date.
[2026-03-23 18:47:51] ✅ git pull成功
[2026-03-23 18:47:51] simayi 无新任务
[2026-03-23 18:48:22] 🔄 自动git pull...
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 a0722dd4416c1ace632fe303170331d47753bde5.
error: Your local changes to the following files would be overwritten by merge:
simayi_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-20260323184823.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 a0722dd4416c1ace632fe303170331d47753bde5
output, run
$ git reset --hard
to recover.