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

2026-03-23 19:47:37 +08:00
parent 8ab45edca0
commit 1895b0ba66
1 changed files with 17 additions and 0 deletions
@@ -6739,3 +6739,20 @@ $ git reset --hard
 to recover.
 [2026-03-23 19:47:06] ⚠️ git pull失败，继续检查
 [2026-03-23 19:47:06] 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 a474b801664ff3c178846a67e79568ed67d19e5a.
+error: The following untracked working tree files would be overwritten by merge:
+	management/tasks/pending/TASK-20260323194737.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 a474b801664ff3c178846a67e79568ed67d19e5a
+output, run
+$ git reset --hard
+to recover.
+[2026-03-23 19:47:36] ⚠️ git pull失败，继续检查
+[2026-03-23 19:47:36] pangtong 无新任务