From b0befd377b49be8ff6ef672a42db2ea5e5c92135 Mon Sep 17 00:00:00 2001
From: Urgau <urgau@numericable.fr>
Date: Wed, 4 Mar 2026 22:18:18 +0100
Subject: [PATCH 1/3] Add docs for `github_comment` field in `[notify-zulip]`

---
 src/triagebot/zulip-notifications.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/triagebot/zulip-notifications.md b/src/triagebot/zulip-notifications.md
index 8d13b0d42..a46c37159 100644
--- a/src/triagebot/zulip-notifications.md
+++ b/src/triagebot/zulip-notifications.md
@@ -29,6 +29,11 @@ zulip_stream = 245100 # #t-compiler/prioritization/alerts
 # {title} is replaced with the issue/PR title.
 topic = "#{number} {title}"
 
+# Optional message to be posted on GitHub when opening the Zulip topic.
+# Useful to add a backlink from GitHub to the Zulip topic.
+# Supports {zulip_topic_url} substitution.
+github_comment = "[Zulip topic]({zulip_topic_url}) was opened to discuss this issue."
+
 # The message to post when the label is added.
 # Supports {number} and {title} substitution.
 message_on_add = "Issue #{number} \"{title}\" has been added."

From 72da79a1bb6d62537b73ed3aab1b2ad3f4aae50e Mon Sep 17 00:00:00 2001
From: Urgau <urgau@numericable.fr>
Date: Wed, 4 Mar 2026 22:19:57 +0100
Subject: [PATCH 2/3] Add docs for `consider-prs-from-bots` field in
 `[merge-conflicts]`

---
 src/triagebot/merge-conflicts.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/triagebot/merge-conflicts.md b/src/triagebot/merge-conflicts.md
index a22b3bf1a..ea601bced 100644
--- a/src/triagebot/merge-conflicts.md
+++ b/src/triagebot/merge-conflicts.md
@@ -20,6 +20,7 @@ This feature is enabled on a repository by having a `[merge-conflicts]` table in
 
 There are several optional keys that you can include:
 
+- `consider-prs-from-bots` --- Should merge conflicts be reported for PR opened by bots.
 - `remove` --- A list of labels to remove from the PR when a conflict is detected.
 - `add` --- A list of labels to add to the PR when a conflict is detected.
 - `unless` --- A list of labels that, if already present on the PR, will prevent triagebot from adding or removing labels.
@@ -28,6 +29,7 @@ There are several optional keys that you can include:
 
 ```toml
 [merge-conflicts]
+consider-prs-from-bots = true
 remove = ['S-waiting-on-bors']
 add = ['S-waiting-on-author']
 unless = ['S-blocked', 'S-waiting-on-crater', 'S-waiting-on-team', 'S-waiting-on-review']

From 93f7deb026d09fac18648297164367f8317ade4a Mon Sep 17 00:00:00 2001
From: Urgau <urgau@numericable.fr>
Date: Wed, 4 Mar 2026 22:22:23 +0100
Subject: [PATCH 3/3] Add docs for `consider-push-from-bots` field in
 `[range-diff]`

---
 src/triagebot/range-diff.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/triagebot/range-diff.md b/src/triagebot/range-diff.md
index 74ac9d67b..955bdb5d1 100644
--- a/src/triagebot/range-diff.md
+++ b/src/triagebot/range-diff.md
@@ -11,6 +11,10 @@ This feature is enabled on a repository by having a empty `[range-diff]` table i
 [range-diff]
 ```
 
+There are optional keys that you can include:
+
+- `consider-push-from-bots` (default: `false`) --- Should push from bots be consider for a range-diff comment.
+
 ## Implementation
 
 See [`src/handlers/check_commits/range_diff.rs`](https://github.com/rust-lang/triagebot/blob/HEAD/src/handlers/check_commits/force_push_range_diff.rs).