From d278e869e984313e3513e0a1320dbfc98453dda4 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Thu, 30 Sep 2021 10:11:35 +0000 Subject: [PATCH] ci(Mergify): configuration update (#159) (#160) Signed-off-by: Mario Karagiorgas (cherry picked from commit ed215e1e325bf3b91db5deac42e9e9b9cccadad8) Co-authored-by: Mario Karagiorgas --- .mergify.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.mergify.yml b/.mergify.yml index ca538ec3..852beacd 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -22,7 +22,9 @@ pull_request_rules: - and: - "#approved-reviews-by>=1" - base=develop - - author=mergify[bot] + - and: + - author=mergify[bot] + - base!=master actions: merge: method: squash