feat: 保留真实合并冲突

feat: squash advanced demo history
2026-10-12 15:23:43 +00:00 · 2026-10-12 15:23:40 +00:00
3 changed files with 4 additions and 2 deletions
@@ -1 +1 @@
-baseline
+feature selects fixture A
@@ -1 +0,0 @@
-# Demo rejected proposal
@@ -0,0 +1,3 @@
+# Demo squash
+Iteration 1
+Iteration 2
Author	SHA1	Message	Date
codex-test	957c8419cb	feat: 保留真实合并冲突	2026-10-12 15:23:43 +00:00
codex-test	e30daf2a6a	feat: squash advanced demo history	2026-10-12 15:23:40 +00:00