summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.mergify/config.yml1
1 files changed, 0 insertions, 1 deletions
diff --git a/.mergify/config.yml b/.mergify/config.yml
index bd6da4c779..3471896a34 100644
--- a/.mergify/config.yml
+++ b/.mergify/config.yml
@@ -38,7 +38,6 @@ pull_request_rules:
actions:
queue:
method: rebase
- rebase_fallback: none
name: default
- name: Post a comment on a PR that can not be merged due to a merge conflict