diff --git a/.mergify.yml b/.mergify.yml index f98cc373a1..5f216d3012 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -1,16 +1,16 @@ queue_rules: - name: default - conditions: + queue_conditions: - check-success=build - check-success=DeepScan - + merge_method: squash + pull_request_rules: - name: Automatic merge on approval conditions: - "#approved-reviews-by>=1" actions: queue: - method: squash name: default - name: automatic branch update conditions: