From 930df204f65a35e1cca24277dc7d3f49bbcd6165 Mon Sep 17 00:00:00 2001 From: Jin Hai Date: Sat, 18 Apr 2020 20:23:35 +0800 Subject: [PATCH] Automerge (#1981) * [skip ci] add mergify config Signed-off-by: jinhai * [skip ci] update mergify config Signed-off-by: jinhai * [skip ci] update changelog Signed-off-by: jinhai --- .mergify/config.yml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/.mergify/config.yml b/.mergify/config.yml index c54af97b38..78d3bdb3e8 100644 --- a/.mergify/config.yml +++ b/.mergify/config.yml @@ -1,7 +1,18 @@ pull_request_rules: - name: Automatic merge on approval conditions: + - "label=automerge" - "#approved-reviews-by>=1" + - "#review-requested=0" + - "#changes-requested-reviews-by=0" + - "#commented-reviews-by=0" actions: merge: - method: merge \ No newline at end of file + method: squash + + - name: Ask to resolve conflict + conditions: + - conflict + actions: + comment: + message: This pull request is now in conflicts. Could you fix it? 🙏