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

2026-03-23 19:10:27 +08:00
parent 662c70263d
commit 7320cf4b9d
2 changed files with 23 additions and 0 deletions
@@ -6106,3 +6106,20 @@ $ git reset --hard
 to recover.
 [2026-03-23 19:09:55] ⚠️ git pull失败，继续检查
 [2026-03-23 19:09:55] 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 c8621976561717220ecd26513673e3c645c3e29f.
+error: The following untracked working tree files would be overwritten by merge:
+	management/tasks/pending/TASK-20260323191026.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 c8621976561717220ecd26513673e3c645c3e29f
+output, run
+$ git reset --hard
+to recover.
+[2026-03-23 19:10:26] ⚠️ git pull失败，继续检查
+[2026-03-23 19:10:26] pangtong 无新任务