Merge pull request #336 from ehuss/merge-conflicts

ehuss · web-flow · commit ff1c1984b9d4 · 2024-11-23T23:20:50.000Z
Enable triagebot merge-conflicts and shortcuts
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"]
