feat: 保留真实合并冲突

2026-10-12 15:23:43 +00:00
7 changed files with 1 additions and 16 deletions
@@ -1 +1 @@
-master selects fixture B
+feature selects fixture A
@@ -1 +0,0 @@
-{"demoEnabled":false}
@@ -1,2 +0,0 @@
-# Demo change 1
-Round 1
@@ -1,2 +0,0 @@
-# Demo change 2
-Round 1
@@ -1,2 +0,0 @@
-# Demo change 3
-Round 1
@@ -1 +0,0 @@
-# Obsolete demo file
@@ -1,7 +0,0 @@
-# Rebase review walkthrough
-
-This synthetic change demonstrates a feature branch rebased and merged through a pull request.
-
- Review the focused documentation diff.
- Confirm the pull request records the rebase merge method.
- Keep this fixture separate from production release notes.