From dd90926583e21fbc872203fd1a6d24e6c4ca434d Mon Sep 17 00:00:00 2001
From: Andras Bacsai <5845193+andrasbacsai@users.noreply.github.com>
Date: Fri, 21 Aug 2026 12:19:05 +0200
Subject: [PATCH] fix(ci): protect main during sync conflicts

---
 .github/workflows/sync-main-to-next.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/sync-main-to-next.yml b/.github/workflows/sync-main-to-next.yml
index 614175d9b4..595a21e799 100644
--- a/.github/workflows/sync-main-to-next.yml
+++ b/.github/workflows/sync-main-to-next.yml
@@ -45,15 +45,17 @@ jobs:
             exit 1
           fi
 
-          existing_pr=$(gh pr list --base next --head main --state open --json url --jq '.[0].url')
+          sync_branch='automation/sync-main-to-next'
+          existing_pr=$(gh pr list --base next --head "$sync_branch" --state open --json url --jq '.[0].url')
           if [ -n "$existing_pr" ]; then
             echo "A main to next pull request already exists: $existing_pr"
           else
+            git push --force origin origin/main:"refs/heads/$sync_branch"
             gh pr create \
               --base next \
-              --head main \
+              --head "$sync_branch" \
               --title 'chore: merge main into next' \
-              --body 'This pull request was created automatically because main could not be merged into next without conflicts.'
+              --body 'This pull request was created automatically because main could not be merged into next without conflicts. Resolve conflicts on this temporary branch; never update main with next.'
           fi
 
           echo 'main could not be merged into next without conflicts.'