From c6d2ed8261bece6ed2bf7894a695eca53eb0b512 Mon Sep 17 00:00:00 2001
From: SuperDooper <37051355+superdooper86@users.noreply.github.com>
Date: Mon, 11 May 2026 20:58:13 +0200
Subject: [PATCH] CI: retry push on rebase conflict in beta workflow

---
 .github/workflows/release-beta.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/release-beta.yml b/.github/workflows/release-beta.yml
index 92568de..c1f8850 100644
--- a/.github/workflows/release-beta.yml
+++ b/.github/workflows/release-beta.yml
@@ -75,5 +75,7 @@ jobs:
           git config user.email "github-actions[bot]@users.noreply.github.com"
           git add version-beta.json README.md
           git commit -m "Beta release ${{ github.ref_name }}"
-          git pull --rebase origin main
-          git push origin HEAD:main
+          for i in 1 2 3 4 5; do
+            git pull --rebase origin main && git push origin HEAD:main && break
+            echo "Push attempt $i failed, retrying..."; sleep 3
+          done