Merge branch 'main' into bot/update-global-workflow-main-2999f3a7af31…

…a56438d7976645a723c8ee7a6f3b
devantler · Sep 24, 2023 · 13b82c5 · 13b82c5
2 parents c7e0cda + 6db164f
commit 13b82c5
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"