update backports strategy for #10260

.github/mergify.yml

@@ -58,10 +58,6 @@ pull_request_rules:
   - actions:
       queue:
         name: default
-        # Merge with a merge commit
-        method: merge
-        # Update the pr branch with rebase, so the history is clean
-        update_method: rebase
     name: Put release branch pull requests in the rebase+merge queue
     conditions:
       - label=merge me
@@ -73,11 +69,7 @@ pull_request_rules:
   # merge+squash strategy for release branches
   - actions:
       queue:
-        name: default
-        method: squash
-        # both update methods get absorbed by the squash, so we use the most
-        # reliable
-        update_method: merge
+        name: squash-merge
     name: Put release branch pull requests in the squash+merge queue
     conditions:
       - base!=master
@@ -90,7 +82,6 @@ pull_request_rules:
   - actions:
       queue:
         name: default
-        # Merge with a merge commit
     name: Put backports in the rebase+merge queue
     conditions:
       - label=merge me
@@ -126,6 +117,7 @@ queue_rules:
     update_bot_account: Mikolaj
     merge_method: merge
     update_method: rebase
+
   - name: squash-merge
     update_bot_account: Mikolaj
     merge_method: squash