From 66f061c60205cecc728247538845ffcf26eeee68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Sat, 9 Nov 2024 07:11:59 +0100
Subject: [PATCH] chore: Sync with WeblateOrg/meta

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

diff --git a/.github/workflows/yarn-update.yml b/.github/workflows/yarn-update.yml
index edf852b869..46eed9d414 100644
--- 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 }}