Skip to content
Merged
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
22 changes: 14 additions & 8 deletions .mergify.yml
Original file line number Diff line number Diff line change
@@ -1,21 +1,27 @@
queue_rules:
- name: default
merge_method: squash

- name: rebase
merge_method: rebase

pull_request_rules:
- name: Auto Squash and Merge
conditions:
- base=master
- status-success=ci
- check-success=ci
- 'label=ready to squash and merge'
actions:
delete_head_branch: {}
merge:
method: squash
strict: smart
queue:
name: default

- name: Auto Rebase and Merge
conditions:
- base=master
- status-success=ci
- check-success=ci
- 'label=ready to rebase and merge'
actions:
delete_head_branch: {}
merge:
method: rebase
strict: smart
queue:
name: rebase