File tree Expand file tree Collapse file tree 1 file changed +34
-1
lines changed Expand file tree Collapse file tree 1 file changed +34
-1
lines changed Original file line number Diff line number Diff line change
1
+ pull_request_rules :
2
+ - name : Ask to resolve conflict
3
+ conditions :
4
+ - conflict
5
+ - -author=dependabot[bot]
6
+ - or :
7
+ - -draft # Don't report conflicts on regular draft.
8
+ - and : # Do report conflicts on draft that are scheduled for the next major release.
9
+ - draft
10
+ - milestone~=v[0-9]\.[0-9]{2}
11
+ actions :
12
+ comment :
13
+ message : This pull request has merge conflicts. Could you please resolve them
14
+ @{{author}}? 🙏
15
+
16
+ - name : Approve trivial maintainer PRs
17
+ conditions :
18
+ - base=master
19
+ - label=trivial
20
+ - author=@sigp/lighthouse
21
+ actions :
22
+ review :
23
+ type : APPROVE
24
+
25
+ - name : Add ready-to-merge labeled PRs to merge queue
26
+ conditions :
27
+ # All branch protection rules are implicit: https://docs.mergify.com/conditions/#about-branch-protection
28
+ - base=master
29
+ - label=send-it
30
+ actions :
31
+ queue :
32
+
33
+
1
34
queue_rules :
2
35
- name : default
3
36
batch_size : 8
@@ -6,7 +39,7 @@ queue_rules:
6
39
merge_method : squash
7
40
commit_message_template : |
8
41
{{ title }} (#{{ number }})
9
-
42
+
10
43
{% for commit in commits %}
11
44
* {{ commit.commit_message }}
12
45
{% endfor %}
You can’t perform that action at this time.
0 commit comments