From 8aa9eea32223ddc5f938fc61d0ef389c48d0e50d Mon Sep 17 00:00:00 2001
From: Richie Cahill <Richie@tmmworkshop.com>
Date: Sun, 22 Jun 2025 21:10:23 -0400
Subject: [PATCH] testing --rebase

---
 .github/workflows/merge_flake_lock_update.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/merge_flake_lock_update.yml b/.github/workflows/merge_flake_lock_update.yml
index de41b22..83c5d57 100644
--- a/.github/workflows/merge_flake_lock_update.yml
+++ b/.github/workflows/merge_flake_lock_update.yml
@@ -21,7 +21,7 @@ jobs:
           pr_number=$(gh pr list --state open --author RichieCahill --label flake_lock_update --json number --jq '.[0].number')
           echo "pr_number=$pr_number" >> $GITHUB_ENV
           if [ -n "$pr_number" ]; then
-            gh pr merge "$pr_number" --auto
+            gh pr merge "$pr_number" --rebase
           else
             echo "No open PR found with label flake_lock_update"
           fi