Enable triagebot merge conflict notifications

rust-lang · Dec 20, 2024 · 90aaa05 · 90aaa05
1 parent efaaa0c
commit 90aaa05
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/triagebot.toml b/triagebot.toml
@@ -28,6 +28,11 @@ label = "O-windows"
 
 [transfer]
 
+[merge-conflicts]
+remove = []
+add = ["S-waiting-on-author"]
+unless = ["S-blocked", "S-waiting-on-review"]
+
 [autolabel."S-waiting-on-review"]
 new_pr = true