Skip to content

Commit 081d7ba

Browse files
authored
Enable triagebot merge conflict notifications (#14972)
This enables merge conflict notifications on GitHub. Homu was providing this service for us, but it was shut down today. I find these notifications useful, as they give an opportunity for the author to proactively rebase and not require a round trip with the reviewer.
2 parents efaaa0c + 90aaa05 commit 081d7ba

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

triagebot.toml

+5
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,11 @@ label = "O-windows"
2828

2929
[transfer]
3030

31+
[merge-conflicts]
32+
remove = []
33+
add = ["S-waiting-on-author"]
34+
unless = ["S-blocked", "S-waiting-on-review"]
35+
3136
[autolabel."S-waiting-on-review"]
3237
new_pr = true
3338

0 commit comments

Comments
 (0)