diff --git a/.github/mergify.yml b/.github/mergify.yml index c1cf62d..94c3374 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -1,11 +1,4 @@ --- -defaults: - actions: - queue: - name: default - method: rebase - update_method: rebase - # each test should be listed separately, do not use regular expressions: # https://docs.mergify.io/conditions.html#validating-all-status-check # Until mergify allows us to have default conditions, we will need to @@ -19,6 +12,8 @@ queue_rules: - check-success=test-suite (pacific) - check-success=test-suite (quincy) - check-success=test-suite (reef) + merge_method: rebase + update_method: rebase pull_request_rules: # Clearing approvals after content changes