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

2026-04-17 18:16:01 +02:00
parent 435c2e4292
commit 703a62f18e
2 changed files with 1 additions and 0 deletions
@@ -56,6 +56,7 @@ spec:
        repoURL: ${{ vars.repoUrl }}
        provider: "gitea"
        prNumber: ${{ task.outputs['open-pr'].pr.id }}
+        mergeMethod: "rebase"
        wait: true
    - uses: git-wait-for-pr
      if: "${{ status('open-pr') != 'Skipped'}}"