diff --git a/triagebot.toml b/triagebot.toml
index 39c18a55697b8..89c6e9d58c2b9 100644
--- a/triagebot.toml
+++ b/triagebot.toml
@@ -402,6 +402,10 @@ message_on_add = """\
 Issue #{number} "{title}" has been added.
 """
 
+[no-merges]
+exclude_labels = ["rollup", "subtree-sync"]
+labels = ["has-merge-commits", "S-waiting-on-author"]
+
 [github-releases]
 format = "rustc"
 project-name = "Rust"