From d9803d41375dfa30b1aec11198eea1e717edadc7 Mon Sep 17 00:00:00 2001 From: Jake Lee Kennedy Date: Mon, 2 Feb 2026 15:47:10 +0000 Subject: [PATCH 1/2] add gitattributes --- .gitattributes | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000000..b44e3b25ce0 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +ab-testing/config/abTests.ts merge=union From a33db344ed92e6a8028c56c4c77cfb0460896081 Mon Sep 17 00:00:00 2001 From: Jake Lee Kennedy Date: Mon, 2 Feb 2026 15:47:22 +0000 Subject: [PATCH 2/2] add dummy test --- ab-testing/config/abTests.ts | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/ab-testing/config/abTests.ts b/ab-testing/config/abTests.ts index a0dd40f2cd1..7cbd8663a01 100644 --- a/ab-testing/config/abTests.ts +++ b/ab-testing/config/abTests.ts @@ -32,6 +32,18 @@ const ABTests: ABTest[] = [ groups: ["control", "variant"], shouldForceMetricsCollection: true, }, + { + name: "commercial-test-test", + description: "Testing test merge confict resolution", + owners: ["commercial.dev@guardian.co.uk"], + status: "ON", + expirationDate: "2026-03-10", + type: "client", + audienceSize: 10 / 100, + audienceSpace: "A", + groups: ["control", "variant"], + shouldForceMetricsCollection: true, + }, { name: "commercial-user-module-liveramp", description: