From d7323ca22c0488af0a404b30bdf355163bd5c636 Mon Sep 17 00:00:00 2001
From: Dhia Ayachi <dhia@hashicorp.com>
Date: Mon, 20 Nov 2023 11:51:39 -0500
Subject: [PATCH] do not auto merge backports (#19694)

do not auto merge backport as there is a bug in backport assistant that could merge the entire main into release branches.
---
 .github/workflows/backport-assistant.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/backport-assistant.yml b/.github/workflows/backport-assistant.yml
index 17462f8112..78125b6dab 100644
--- a/.github/workflows/backport-assistant.yml
+++ b/.github/workflows/backport-assistant.yml
@@ -23,7 +23,7 @@ jobs:
     steps:
       - name: Run Backport Assistant for release branches
         run: |
-          backport-assistant backport -merge-method=squash -gh-automerge
+          backport-assistant backport -merge-method=squash
         env:
           BACKPORT_LABEL_REGEXP: "backport/(?P<target>\\d+\\.\\d+)"
           BACKPORT_TARGET_TEMPLATE: "release/{{.target}}.x"