From 1bdc28097dc4d67c21b26bd206e9cc2b4e97a090 Mon Sep 17 00:00:00 2001
From: Thorsten Sommer <SommerEngineering@users.noreply.github.com>
Date: Thu, 16 Jul 2026 08:06:29 +0200
Subject: [PATCH] Switch PR merging to squash in Flatpak workflow (#863)

---
 .github/workflows/build-and-release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-and-release.yml b/.github/workflows/build-and-release.yml
index 3f366b4e..29be5537 100644
--- a/.github/workflows/build-and-release.yml
+++ b/.github/workflows/build-and-release.yml
@@ -441,7 +441,7 @@ jobs:
 
           gh pr merge "$pr_number" \
             --repo "$FLATPAK_REPOSITORY" \
-            --merge \
+            --squash \
             --delete-branch \
             --match-head-commit "$sync_commit"