mirror of
https://github.com/ceph/go-ceph
synced 2025-02-06 13:32:12 +00:00
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:
parent
e7791c9e06
commit
a5c777bf33
2
.github/mergify.yml
vendored
2
.github/mergify.yml
vendored
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user