diff --git a/.mergify.yml b/.mergify.yml index e2a89dd..6190f36 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -14,4 +14,17 @@ pull_request_rules: - label!=no-mergify - status-success=continuous-integration/drone/pr - '#approved-reviews-by>=1' +- name: master branch forced + actions: + merge: + method: rebase + rebase_fallback: merge + strict: false + delete_head_branch: {} + conditions: + - base=master + - -merged + - -closed + - label!=no-mergify + - label=Merge Now