From 44cd00b4bcace090b3bc74fdd354974fbeaa4bb9 Mon Sep 17 00:00:00 2001
From: Christian Zunker <827818+czunker@users.noreply.github.com>
Date: Tue, 3 Dec 2024 12:30:11 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Fix=20gh=20merge=20command=20(#1?=
 =?UTF-8?q?505)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Christian Zunker <christian@mondoo.com>
---
 .github/workflows/pr-test-lint.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/pr-test-lint.yml b/.github/workflows/pr-test-lint.yml
index 90862eeb..aec69533 100644
--- a/.github/workflows/pr-test-lint.yml
+++ b/.github/workflows/pr-test-lint.yml
@@ -146,7 +146,7 @@ jobs:
       - name: Approve and merge a PR
         run: |
           gh pr review ${{ steps.pr.outputs.number }} --approve
-          gh pr merge ${{ steps.pr.outputs.number }} --squash --merge
+          gh pr merge ${{ steps.pr.outputs.number }} --squash
         env:
           GH_TOKEN: ${{ steps.generate-token.outputs.token }}
   event_file: