From f62660837344e26cde0133844f5e3d4147c8f823 Mon Sep 17 00:00:00 2001
From: Pratyush Vashisht <4387947+prvashisht@users.noreply.github.com>
Date: Mon, 10 Jun 2024 21:11:50 +0200
Subject: [PATCH] chore: Fix PR merge commands and include squash and
 delete-branch options

---
 .github/workflows/release-extension.yaml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/release-extension.yaml b/.github/workflows/release-extension.yaml
index f6e4dd1..40939fd 100644
--- a/.github/workflows/release-extension.yaml
+++ b/.github/workflows/release-extension.yaml
@@ -111,11 +111,10 @@ jobs:
         commit-message: "Update README and CHANGELOG for v${{ needs.check_version.outputs.new_version }}"
         body: "This PR updates the README and CHANGELOG files for the new version v${{ needs.check_version.outputs.new_version }}."
         labels: documentation, release, github-actions
-        delete-branch: true
 
     - name: Merge Pull Request
       id: merge_pr
-      run: gh pr merge "${{ steps.create_pr.outputs.pull-request-number }}"
+      run: gh pr merge "${{ steps.create_pr.outputs.pull-request-number }}" --squash --delete-branch
       env:
         GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}