From 148213ee5cc264b47f5314916a378e18c15090b6 Mon Sep 17 00:00:00 2001
From: Seth Flynn <getchoo@tuta.io>
Date: Tue, 11 Feb 2025 00:15:29 -0500
Subject: ci: use rebase merge for bot PRs

---
 .github/workflows/update-lock.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '.github/workflows')

diff --git a/.github/workflows/update-lock.yaml b/.github/workflows/update-lock.yaml
index bac3150..8b24769 100644
--- a/.github/workflows/update-lock.yaml
+++ b/.github/workflows/update-lock.yaml
@@ -56,7 +56,7 @@ jobs:
       - name: Enable auto-merge
         shell: bash
         if: ${{ env.PR_ID != '' }}
-        run: gh pr merge --auto --squash "$PR_ID"
+        run: gh pr merge --auto --rebase "$PR_ID"
         env:
           PR_ID: ${{ steps.pull-request.outputs.pull-request-number }}
           GH_TOKEN: ${{ steps.app-token.outputs.token }}
-- 
cgit v1.2.3