From 44b300742c8cf24331f62b894f6dbb3cd0513a80 Mon Sep 17 00:00:00 2001
From: Okan Sahin <osahin@adobe.com>
Date: Wed, 8 May 2024 08:10:51 +0200
Subject: [PATCH] Squash merges

---
 .github/workflows/merge-to-stage.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/merge-to-stage.js b/.github/workflows/merge-to-stage.js
index 153c155904..d8dceb3cbe 100644
--- a/.github/workflows/merge-to-stage.js
+++ b/.github/workflows/merge-to-stage.js
@@ -135,7 +135,12 @@ const merge = async ({ prs }) => {
     }
     files.forEach((file) => (SEEN[file] = true));
     if (!process.env.LOCAL_RUN)
-      await github.rest.pulls.merge({ owner, repo, pull_number: number });
+      await github.rest.pulls.merge({
+        owner,
+        repo,
+        pull_number: number,
+        merge_method: 'squash',
+      });
     body = `- [${title}](${html_url})\n${body}`;
     const isHighImpact = labels.includes(LABELS.highImpact);
     if (isHighImpact && process.env.SLACK_HIGH_IMPACT_PR_WEBHOOK) {