From f740ef61cc6e1f8fa8cd74ba9591ac1ef545cd01 Mon Sep 17 00:00:00 2001 From: ibizaman Date: Tue, 17 Dec 2024 21:19:42 +0100 Subject: [PATCH] change auto-merge to rebase --- .github/workflows/auto-merge.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/auto-merge.yaml b/.github/workflows/auto-merge.yaml index 27f7323..815c6f2 100644 --- a/.github/workflows/auto-merge.yaml +++ b/.github/workflows/auto-merge.yaml @@ -29,7 +29,7 @@ jobs: - uses: reitermarkus/automerge@v2 with: token: ${{ secrets.GH_TOKEN_FOR_UPDATES }} - merge-method: squash + merge-method: rebase do-not-merge-labels: never-merge required-labels: automerge pull-request: ${{ github.event.inputs.pull-request }}