Use Smart-mode for "Strict Merge" to enable automatic rebase

Enabling Smart-mode for "Strict Merge" causes Mergify to do a rebase of
the PR before merging. The rebase will trigger CI runs again, and
merging will be done only when the CI results are successful.

See-also: https://docs.mergify.io/actions.html#merge
Signed-off-by: Niels de Vos <ndevos@redhat.com>
This commit is contained in:
Niels de Vos 2020-11-04 15:04:34 +01:00 committed by John Mulligan
parent e7791c9e06
commit a5c777bf33

2
.github/mergify.yml vendored
View File

@ -23,6 +23,8 @@ pull_request_rules:
merge:
method: rebase
rebase_fallback: merge
strict: smart
strict_method: rebase
dismiss_reviews: {}
delete_head_branch: {}
- name: ask to resolve conflict