Merge 8f50af6 into backport/update-backport-squash/presently-inviting…

…-whale
hashicorp · Sep 28, 2022 · 9d2a657 · 9d2a657
2 parents 648ffff + 8f50af6
commit 9d2a657
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml
@@ -14,7 +14,7 @@ jobs:
     container: hashicorpdev/backport-assistant:0.2.5
     steps:
       - name: Run Backport Assistant
-        run: backport-assistant backport -automerge
+        run: backport-assistant backport -automerge -merge-method=squash
         env:
           BACKPORT_LABEL_REGEXP: "backport/(?P<target>\\d+\\.\\d+\\.x)"
           BACKPORT_TARGET_TEMPLATE: "release/{{.target}}"