testdata: seed sandbox conflict base

Stack Demo · Stack Demo · commit 3d0465ca3026 · 2026-03-25T16:20:49.000-04:00
diff --git a/_test_data/sandbox/conflict/shared.txt b/_test_data/sandbox/conflict/shared.txt
@@ -1,4 +1,4 @@
 conflict scenario
-owner: sandbox-trunk-drift
-resolution: trunk drift version
-marker: 44caee2
+owner: sandbox-conflict-base
+resolution: parent branch version
+marker: 74d5552
