From 561150eadf624bdf2668689a307add2483b1bb33 Mon Sep 17 00:00:00 2001
From: Eric Huss <eric@huss.org>
Date: Sat, 23 Nov 2024 14:50:51 -0800
Subject: [PATCH] Enable triagebot merge-conflict notifications

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

diff --git a/triagebot.toml b/triagebot.toml
index 4a29166cb..5888defef 100644
--- 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"]