From c9b8f0f972bd5922557c0167054d1915891d23f9 Mon Sep 17 00:00:00 2001
From: Justin Oros <JustinOros@gmail.com>
Date: Wed, 7 Oct 2026 13:05:46 -0700
Subject: [PATCH] Rebase and retry data push in workflow

---
 .github/workflows/update-data.yml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/update-data.yml b/.github/workflows/update-data.yml
index ac54da23..dc4da236 100644
--- a/.github/workflows/update-data.yml
+++ b/.github/workflows/update-data.yml
@@ -58,4 +58,11 @@ jobs:
             exit 0
           fi
           git commit -m "Update fiber data"
-          git push
+          for i in 1 2 3 4 5; do
+            if git pull --rebase -X theirs origin main && git push origin HEAD:main; then
+              exit 0
+            fi
+            git rebase --abort 2>/dev/null || true
+            sleep $((i * 10))
+          done
+          exit 1