From 3f5c829b3a5b0a134c3fba9d32591d44af7b68e4 Mon Sep 17 00:00:00 2001
From: Frank Kilcommins <frank@jentic.com>
Date: Wed, 8 Jul 2026 09:37:45 +0100
Subject: [PATCH] fix(workflows): use -X theirs to resolve sync merge conflicts

---
 .github/workflows/sync-dev-to-vX.Y-dev.yaml | 2 +-
 .github/workflows/sync-main-to-dev.yaml     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/sync-dev-to-vX.Y-dev.yaml b/.github/workflows/sync-dev-to-vX.Y-dev.yaml
index 0bdd96e..0339ff3 100644
--- a/.github/workflows/sync-dev-to-vX.Y-dev.yaml
+++ b/.github/workflows/sync-dev-to-vX.Y-dev.yaml
@@ -44,7 +44,7 @@ jobs:
             SYNC="$BASE-sync-with-$HEAD"
 
             git checkout -b $SYNC origin/$SYNC || git checkout -b $SYNC origin/$BASE
-            git merge origin/$HEAD -m "Merge $HEAD into $SYNC"
+            git merge -X theirs origin/$HEAD -m "Merge $HEAD into $SYNC"
             git checkout origin/$BASE src/
             git checkout origin/$BASE tests/schema/
             git commit -m "Restored src/ and tests/schema/" || echo ""
diff --git a/.github/workflows/sync-main-to-dev.yaml b/.github/workflows/sync-main-to-dev.yaml
index c6f996a..fa19338 100644
--- a/.github/workflows/sync-main-to-dev.yaml
+++ b/.github/workflows/sync-main-to-dev.yaml
@@ -40,7 +40,7 @@ jobs:
           SYNC="$BASE-sync-with-$HEAD"
 
           git checkout -b $SYNC origin/$SYNC || git checkout -b $SYNC origin/$BASE
-          git merge origin/$HEAD -m "Merge $HEAD into $SYNC"
+          git merge -X theirs origin/$HEAD -m "Merge $HEAD into $SYNC"
           git checkout origin/$BASE src/
           git checkout origin/$BASE tests/schema/
           git commit -m "Restored src/ and tests/schema/" || echo ""