From 5a6dcba3227cd9839b15c5a2eeebfe749f05dee8 Mon Sep 17 00:00:00 2001
From: DanStough <dan.stough@hashicorp.com>
Date: Mon, 8 May 2023 10:47:43 -0400
Subject: [PATCH] chore(ci): fix backport assistant not finding new branches

---
 .github/workflows/backport.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml
index c1548332e0..48883e24fa 100644
--- a/.github/workflows/backport.yml
+++ b/.github/workflows/backport.yml
@@ -11,10 +11,10 @@ jobs:
   backport:
     if: github.event.pull_request.merged
     runs-on: ubuntu-latest
-    container: hashicorpdev/backport-assistant:0.2.5
+    container: hashicorpdev/backport-assistant:0.3.3
     steps:
       - name: Run Backport Assistant
-        run: backport-assistant backport -automerge
+        run: backport-assistant backport -merge-method=squash -gh-automerge
         env:
           BACKPORT_LABEL_REGEXP: "backport/(?P<target>\\d+\\.\\d+\\.x)"
           BACKPORT_TARGET_TEMPLATE: "release/{{.target}}"