diff --git a/.mergify.yml b/.mergify.yml index 83c1864c..cbc80aa3 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -17,20 +17,6 @@ queue_rules: merge_method: squash pull_request_rules: - - name: Auto Squash and Merge - conditions: - - base=master - - status-success=ci - - 'label=ready to squash and merge' - actions: - delete_head_branch: {} - - 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: