* [skip ci] add mergify config

Signed-off-by: jinhai <hai.jin@zilliz.com>

* [skip ci] update mergify config

Signed-off-by: jinhai <hai.jin@zilliz.com>

* [skip ci] update changelog

Signed-off-by: jinhai <hai.jin@zilliz.com>
pull/1983/head
Jin Hai 2020-04-18 20:23:35 +08:00 committed by GitHub
parent 06335ad80b
commit 930df204f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 1 deletions

View File

@ -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
method: squash
- name: Ask to resolve conflict
conditions:
- conflict
actions:
comment:
message: This pull request is now in conflicts. Could you fix it? 🙏