--- defaults: actions: queue: name: default method: rebase rebase_fallback: merge 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 # repeat this list in a few places. queue_rules: - name: default conditions: - check-success=check - check-success=dpulls - check-success=test-suite (nautilus) - check-success=test-suite (octopus) - check-success=test-suite (pacific) pull_request_rules: # Clearing approvals after content changes - name: remove outdated approvals conditions: - base=master actions: dismiss_reviews: approved: true changes_requested: false # Our auto merge rules - name: automatic merge conditions: - label!=do-not-merge - label!=extended-review - base=master - "#changes-requested-reviews-by=0" - status-success=check - status-success=dpulls # See above - status-success=test-suite (nautilus) - status-success=test-suite (octopus) - status-success=test-suite (pacific) - or: - and: - label=no-API - "#approved-reviews-by>=1" - and: - label=API - "#approved-reviews-by>=2" - and: - label=API - "#approved-reviews-by>=1" - "updated-at<10 days ago" actions: queue: {} dismiss_reviews: {} delete_head_branch: {} # Conflict resolution prompt - name: ask to resolve conflict conditions: - conflict actions: comment: message: "This pull request now has conflicts with the target branch. Could you please resolve conflicts and force push the corrected changes? 🙏"