chore: use rebase strategy for lock updates

WeblateOrg · Nov 8, 2024 · 60fbff3 · 60fbff3
1 parent 3559998
commit 60fbff3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.github/workflows/uv-upgrade.yml b/.github/workflows/uv-upgrade.yml
@@ -69,6 +69,6 @@ jobs:
 
     - name: Enable Pull Request Automerge
       if: github.ref == 'refs/heads/main' && steps.cpr.outputs.pull-request-operation != 'none'
-      run: gh pr merge --merge --auto "${{ steps.cpr.outputs.pull-request-number }}"
+      run: gh pr merge --rebase --auto "${{ steps.cpr.outputs.pull-request-number }}"
       env:
         GH_TOKEN: ${{ secrets.WEBLATE_CI_TOKEN }}
diff --git a/.github/workflows/yarn-update.yml b/.github/workflows/yarn-update.yml
@@ -71,6 +71,6 @@ jobs:
 
     - name: Enable Pull Request Automerge
       if: github.ref == 'refs/heads/main' && steps.cpr.outputs.pull-request-operation != 'none'
-      run: gh pr merge --merge --auto "${{ steps.cpr.outputs.pull-request-number }}"
+      run: gh pr merge --rebase --auto "${{ steps.cpr.outputs.pull-request-number }}"
       env:
         GH_TOKEN: ${{ secrets.WEBLATE_CI_TOKEN }}