Merge pull request #1682 from ehuss/merge-conflicts

Enable triagebot merge-conflict notifications
rust-lang · Dec 3, 2024 · bf115a4 · bf115a4
2 parents 40c0365 + 561150e
commit bf115a4
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/triagebot.toml b/triagebot.toml
@@ -6,3 +6,8 @@ allow-unauthenticated = [
 [assign]
 
 [shortcut]
+
+[merge-conflicts]
+remove = []
+add = ["S-waiting-on-author"]
+unless = ["S-blocked", "S-waiting-on-team", "S-waiting-on-review"]