From d18b3223dea29ffe0555563991809c2be2ffce8e Mon Sep 17 00:00:00 2001 From: Pierre Penninckx Date: Sun, 3 Mar 2024 16:56:43 -0800 Subject: [PATCH] prefer squashing for auto-merging (#196) --- .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 815c6f2..27f7323 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: rebase + merge-method: squash do-not-merge-labels: never-merge required-labels: automerge pull-request: ${{ github.event.inputs.pull-request }}