Merge branch 'main' into bot/update-global-workflow-main-2aa57c483d91…

…f013c35cbdf35737265a67d74f0e
devantler · Sep 24, 2023 · f534196 · f534196
2 parents a69dd23 + 6db164f
commit f534196
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/.github/workflows/auto-merge.yaml b/.github/workflows/auto-merge.yaml
@@ -28,6 +28,7 @@ jobs:
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
           MERGE_LABELS: ""
           MERGE_METHOD: "squash"
+          MERGE_RETRIES: 60
           UPDATE_LABELS: ""
           UPDATE_METHOD: "rebase"