From 13c46f410a86f9f739bf4b69666df54064a7a567 Mon Sep 17 00:00:00 2001
From: Jason Ross <jason.ross841@gmail.com>
Date: Fri, 17 Oct 2025 12:07:24 -0500
Subject: [PATCH] changed merge strategy to rebase to maintain linear history

---
 .github/workflows/release.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 64a1fc5..6ae8bac 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -414,8 +414,8 @@ jobs:
           echo "pr_number=$PR_NUMBER" >> $GITHUB_OUTPUT
           echo "Created PR #$PR_NUMBER: $PR_URL"
 
-          # Enable auto-merge (merge commit to maintain history)
-          if ! gh pr merge "$PR_NUMBER" --auto --merge --repo ${{ github.repository }}; then
+          # Enable auto-merge (rebase for fast-forward)
+          if ! gh pr merge "$PR_NUMBER" --auto --rebase --repo ${{ github.repository }}; then
             echo "::error::Failed to enable auto-merge for PR #$PR_NUMBER"
             exit 1
           fi