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'}}"