From f7c05ab78842c62b72461665c1046d856083254b Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 5 Jan 2026 08:26:18 +0000 Subject: [PATCH] Use squash merge when promoting stable releases to main Co-authored-by: jmiller-moko <230051081+jmiller-moko@users.noreply.github.com> --- .github/workflows/release_pipeline.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release_pipeline.yml b/.github/workflows/release_pipeline.yml index 3c9041b..118f936 100644 --- a/.github/workflows/release_pipeline.yml +++ b/.github/workflows/release_pipeline.yml @@ -1007,7 +1007,7 @@ else: --body "Automated PR created by release pipeline. Version branch is retained by policy." \ || true - - name: Attempt to merge PR (best effort) + - name: Attempt to merge PR (best effort, squash merge) env: GH_TOKEN: ${{ github.token }} run: | @@ -1021,7 +1021,7 @@ else: exit 1 fi - gh pr merge "${PR_NUMBER}" --merge --delete-branch=false \ + gh pr merge "${PR_NUMBER}" --squash --delete-branch=false \ || echo "PR merge blocked by branch protection or policy" >> "${GITHUB_STEP_SUMMARY}" - name: Report run context (always)