chore: Sync with WeblateOrg/meta

WeblateOrg · Nov 9, 2024 · 66f061c · 66f061c
1 parent 486b068
commit 66f061c
Showing 1 changed file with 1 addition and 1 deletion.
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 }}