Rebase and retry data push in workflow

2026-10-07 13:14:50 -07:00
parent bb190374e3
commit c9b8f0f972
1 changed files with 8 additions and 1 deletions
@@ -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