From df94eff272427e7238f05b715cbcf0805ec388e6 Mon Sep 17 00:00:00 2001
From: Eric Huss <eric@huss.org>
Date: Sat, 23 Nov 2024 14:57:48 -0800
Subject: [PATCH] Enable triagebot merge-conflicts and shortcuts

---
 triagebot.toml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/triagebot.toml b/triagebot.toml
index 5648018b..61be91bf 100644
--- 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"]