From 842d27e1860eda2a16fa4973c4a7fc01ae518a87 Mon Sep 17 00:00:00 2001 From: Kjeld Schouten Date: Mon, 4 Nov 2024 14:52:45 +0100 Subject: [PATCH] Update automerge.yaml Signed-off-by: Kjeld Schouten --- .github/workflows/automerge.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/automerge.yaml b/.github/workflows/automerge.yaml index 58f1acd7085..0edfe01ad8a 100644 --- a/.github/workflows/automerge.yaml +++ b/.github/workflows/automerge.yaml @@ -26,3 +26,5 @@ jobs: GITHUB_TOKEN: "${{ secrets.BOT_TOKEN }}" UPDATE_RETRIES: 24 UPDATE_RETRY_SLEEP: 60000 + MERGE_METHOD: "squash" +