From f2eb6ff69f32c6e7f972f65138cd19071507809a Mon Sep 17 00:00:00 2001 From: Vladimir Potekhin <46284632+vladimirpotekhin@users.noreply.github.com> Date: Thu, 24 Oct 2024 16:11:33 +0300 Subject: [PATCH] chore: disable squash automerge in release branch (#9560) --- .github/workflows/auto-merge.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml index 9f043572cfc7..510112f12cd9 100644 --- a/.github/workflows/auto-merge.yml +++ b/.github/workflows/auto-merge.yml @@ -51,6 +51,7 @@ jobs: if: env.IS_TAIGA_FAMILY_BOT_PR_AUTHOR == 'true' with: token: ${{ secrets.TAIGA_FAMILY_BOT_PAT }} + merge-method: ${{ (contains(github.head_ref, 'release/') && 'merge') || 'squash' }} concurrency: group: ${{ github.workflow }}-${{ github.ref }}