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

2026-03-23 19:02:43 +08:00
parent ad82c66e6c
commit 4bb7c8efbb
2 changed files with 23 additions and 0 deletions
@@ -5873,3 +5873,20 @@ $ git reset --hard
 to recover.
 [2026-03-23 19:02:11] ⚠️ git pull失败，继续检查
 [2026-03-23 19:02:11] pangtong 无新任务
+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 3b1874f3caf50663007e7d97545cd5c1c00cc0a8.
+error: The following untracked working tree files would be overwritten by merge:
+	management/tasks/pending/TASK-20260323190242.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 3b1874f3caf50663007e7d97545cd5c1c00cc0a8
+output, run
+$ git reset --hard
+to recover.
+[2026-03-23 19:02:42] ⚠️ git pull失败，继续检查
+[2026-03-23 19:02:42] pangtong 无新任务