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

2026-03-23 18:50:14 +08:00
parent fe14ce9c82
commit c1d0a411af
4 changed files with 46 additions and 0 deletions
@@ -4629,3 +4629,19 @@ to recover.
 [2026-03-23 18:49:42] 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 9d8455111505454b5a0f203bdff3f19cbf2a34f4.
+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.
+Aborting
+fatal: Cannot fast-forward your working tree.
+After making sure that you saved anything precious from
+$ git diff 9d8455111505454b5a0f203bdff3f19cbf2a34f4
+output, run
+$ git reset --hard
+to recover.
+[2026-03-23 18:50:13] ⚠️ git pull失败，继续检查
+[2026-03-23 18:50:13] ⚠️ git pull失败，继续检查
+[2026-03-23 18:50:13] zhaoyun 无新任务