Skip to content

Commit 4ba44c4

Browse files
authored
chore(mergifyio): use consistent conflict label (#4178)
Mergifyio applies the "conflicts" label whereas we apply the "conflict" label. Example: #4138
1 parent 46aa105 commit 4ba44c4

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

.mergify.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,11 @@ pull_request_rules:
4242
message: "@{{author}} this pull request is now in conflict 😩"
4343
label:
4444
add:
45-
- conflict
45+
- conflicts
4646
- name: remove conflict label if not needed
4747
conditions:
4848
- -conflict
4949
actions:
5050
label:
5151
remove:
52-
- conflict
52+
- conflicts

0 commit comments

Comments
 (0)