Skip to content
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 19 additions & 7 deletions .mergify.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,22 @@
queue_rules:
- name: duplicated default from Auto Rebase and Merge
queue_conditions:
- base=master
- status-success=ci
- 'label=ready to squash and merge'
- base=master
- status-success=ci
- 'label=ready to rebase and merge'
merge_conditions: []
merge_method: rebase
- name: default
conditions:
queue_conditions:
- base=master
- status-success=ci
- 'label=ready to squash and merge'
merge_conditions:
- check-success=ci

merge_method: squash

pull_request_rules:
- name: Auto Squash and Merge
Expand All @@ -12,16 +26,14 @@ pull_request_rules:
- 'label=ready to squash and merge'
actions:
delete_head_branch: {}
queue:
method: squash
name: default
- name: Auto Rebase and Merge
conditions:
- base=master
- status-success=ci
- 'label=ready to rebase and merge'
actions:
delete_head_branch: {}
- name: Auto Rebase and Merge + Auto Squash and Merge
conditions: []
actions:
queue:
method: rebase
name: default
Loading