From 472f11e5b6d1878b12dbd663a939b08d41a95148 Mon Sep 17 00:00:00 2001 From: Richie Cahill Date: Sat, 21 Jun 2025 22:10:18 -0400 Subject: [PATCH] updated to --rebase --- .github/workflows/update-flake-lock.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/update-flake-lock.yml b/.github/workflows/update-flake-lock.yml index bf0a16b..ee21680 100644 --- a/.github/workflows/update-flake-lock.yml +++ b/.github/workflows/update-flake-lock.yml @@ -23,7 +23,7 @@ jobs: - name: Enable auto-merge if: ${{ success() }} run: | - gh pr merge --auto --merge "$PR_URL" + gh pr merge --auto --rebase "$PR_URL" env: PR_URL: ${{ steps.update-flake-lock.outputs.pull-request-url }} GITHUB_TOKEN: ${{ secrets.GH_TOKEN_FOR_UPDATES }}