From ad3a5e10138ec937092213ffc6f43563145dafdd Mon Sep 17 00:00:00 2001
From: Janis <janis.e.20@gmx.de>
Date: Fri, 17 Apr 2026 18:38:47 +0200
Subject: [PATCH] feat: add merge method configuration for pull requests in
 orch-promotion-template.yaml

---
 kargo-projects/orchestration-stack/orch-promotion-template.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kargo-projects/orchestration-stack/orch-promotion-template.yaml b/kargo-projects/orchestration-stack/orch-promotion-template.yaml
index 0ef5e8a..c07f1c7 100644
--- a/kargo-projects/orchestration-stack/orch-promotion-template.yaml
+++ b/kargo-projects/orchestration-stack/orch-promotion-template.yaml
@@ -56,7 +56,7 @@ spec:
         repoURL: ${{ vars.repoUrl }}
         provider: "gitea"
         prNumber: ${{ task.outputs['open-pr'].pr.id }}
-        mergeMethod: "rebase"
+        mergeMethod: "squash"
         wait: true
     - uses: git-wait-for-pr
       if: "${{ status('open-pr') != 'Skipped'}}"