From 985bb770c03045e0b54eb60d943630b70cf0b359 Mon Sep 17 00:00:00 2001 From: Dimitri Kennedy Date: Thu, 26 Mar 2026 14:28:34 -0400 Subject: [PATCH] testdata: seed sandbox conflict base --- _test_data/sandbox/conflict/shared.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/_test_data/sandbox/conflict/shared.txt b/_test_data/sandbox/conflict/shared.txt index f53ef9b..ea16f16 100644 --- 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: 00e3fde