feat: add merge method configuration for pull requests in orch-promotion-template.yaml

2026-04-17 18:38:47 +02:00
parent 703a62f18e
commit ad3a5e1013
1 changed files with 1 additions and 1 deletions
@@ -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'}}"