Enable mergify strict mode

In the past we had strict mode in branch protection. This didn't really work as it broke mergify. Now mergify supports this options and takes care of the merging automatically. Let's see how it goes ;)

Reason is the recent build failures we had on master, during a busy merge day. This could have been prevented if sequential PR's where re-merging with master.

More info: https://doc.mergify.io/strict-workflow.html
master
Tim Möhlmann 6 years ago committed by GitHub
parent a634c7b72d
commit a2a9512afa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -6,6 +6,7 @@ pull_request_rules:
actions: actions:
merge: merge:
method: merge method: merge
strict: true
- name: Trusted author, successful travis and 1 approved review - name: Trusted author, successful travis and 1 approved review
conditions: conditions:
- author~=(kaiyou|muhlemmer|mildred|HorayNarea|adi90x|hoellen|ofthesun9) - author~=(kaiyou|muhlemmer|mildred|HorayNarea|adi90x|hoellen|ofthesun9)
@ -14,3 +15,4 @@ pull_request_rules:
actions: actions:
merge: merge:
method: merge method: merge
strict: true

Loading…
Cancel
Save