From a9a84fef006a4bb2fade86aecabff049a2866517 Mon Sep 17 00:00:00 2001 From: Christophe CHAUVET Date: Fri, 23 Oct 2020 22:04:11 +0200 Subject: [PATCH] Fix mergify.io --- .mergify.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.mergify.yml b/.mergify.yml index a506741d4..9789e9c38 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -35,10 +35,4 @@ pull_request_rules: merge: method: squash strict: true - strict_method: rebasepull_request_rules: - - name: Automatic merge on approval - conditions: - - "#approved-reviews-by>=1" - actions: - merge: - method: merge + strict_method: rebase