From 00ce867f99a9c16bdc9ad0251f48a72ce8c377d0 Mon Sep 17 00:00:00 2001
From: Dimitri Kennedy <dimitrikennedy@gmail.com>
Date: Wed, 25 Mar 2026 14:46:27 -0400
Subject: [PATCH] testdata: seed sandbox trunk drift

---
 _test_data/sandbox/conflict/shared.txt | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 _test_data/sandbox/conflict/shared.txt

diff --git a/_test_data/sandbox/conflict/shared.txt b/_test_data/sandbox/conflict/shared.txt
new file mode 100644
index 0000000..fd9e33f
--- /dev/null
+++ b/_test_data/sandbox/conflict/shared.txt
@@ -0,0 +1,4 @@
+conflict scenario
+owner: sandbox-trunk-drift
+resolution: trunk drift version
+marker: e7e33dc