diff options
| author | Seth Flynn <[email protected]> | 2025-02-11 00:15:29 -0500 |
|---|---|---|
| committer | Seth Flynn <[email protected]> | 2025-02-11 00:20:26 -0500 |
| commit | 148213ee5cc264b47f5314916a378e18c15090b6 (patch) | |
| tree | 5961bde663c279fe8997dab4ab1dd64680a7a7ad /.github/workflows | |
| parent | fef29232c28e45156f0bde9d3b6a3962f16274f0 (diff) | |
ci: use rebase merge for bot PRs
Diffstat (limited to '.github/workflows')
| -rw-r--r-- | .github/workflows/update-lock.yaml | 2 |
1 files changed, 1 insertions, 1 deletions
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 }} |