Merge pull request #336 from ehuss/merge-conflicts

Enable triagebot merge-conflicts and shortcuts
rust-lang · Nov 23, 2024 · ff1c198 · ff1c198
2 parents 8d384b1 + df94eff
commit ff1c198
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/triagebot.toml b/triagebot.toml
@@ -2,3 +2,9 @@
 
 [relabel]
 
+[shortcut]
+
+[merge-conflicts]
+remove = []
+add = ["S-waiting-on-author"]
+unless = ["S-blocked", "S-waiting-on-review"]