File tree Expand file tree Collapse file tree 1 file changed +33
-0
lines changed Expand file tree Collapse file tree 1 file changed +33
-0
lines changed Original file line number Diff line number Diff line change 1+ pull_request_rules :
2+ - name : automatic merge
3+ conditions :
4+ - and : &base_checks
5+ - base=master
6+ - -label~=^acceptance-tests-needed|not-ready
7+ - status-success=integration
8+ - status-success=unit
9+ - and :
10+ - " #approved-reviews-by>=1"
11+ - " #changes-requested-reviews-by=0"
12+ # https://doc.mergify.io/examples.html#require-all-requested-reviews-to-be-approved
13+ - " #review-requested=0"
14+ actions :
15+ merge :
16+ method : merge
17+ - name : automatic merge on special label
18+ conditions :
19+ - and : *base_checks
20+ - and :
21+ # mergify config checks needs at least two rules in "and" so we repeat
22+ # one from the base checks
23+ - base=master
24+ - label=merge-fast
25+ actions :
26+ merge :
27+ method : merge
28+ - name : ask to resolve conflict
29+ conditions :
30+ - conflict
31+ actions :
32+ comment :
33+ message : This pull request is now in conflicts. Could you fix it? 🙏
You can’t perform that action at this time.
0 commit comments