diff --git a/.mergify.yml b/.mergify.yml index ed09b1f7..c96d7fe1 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -18,7 +18,6 @@ merge_queue: queue_rules: - name: single-commit - autoqueue: true batch_size: 1 merge_method: rebase queue_conditions: &single_commit_conditions @@ -44,7 +43,6 @@ queue_rules: merge_conditions: *single_commit_conditions - name: multi-commit - autoqueue: true batch_size: 1 merge_method: squash queue_conditions: &multi_commit_conditions @@ -77,3 +75,6 @@ pull_request_rules: actions: comment: message: "@{{author}} This pull request has conflicts with the target branch. Please resolve them and update the branch before merging." +merge_protections_settings: + auto_merge_conditions: true + reporting_method: check-runs