diff options
| author | Alex Macleod <alex@macleod.io> | 2025-03-31 15:05:45 +0000 |
|---|---|---|
| committer | Alex Macleod <alex@macleod.io> | 2025-03-31 15:05:45 +0000 |
| commit | 3e837ec25e14b362c26fcb9fdb9f3e2dcdbde2e5 (patch) | |
| tree | 3b2353b1ea1c94b8eda219a15466a13149051056 | |
| parent | b96fecfee984502c5ea1ca76ef871374efc0da85 (diff) | |
| download | rust-3e837ec25e14b362c26fcb9fdb9f3e2dcdbde2e5.tar.gz rust-3e837ec25e14b362c26fcb9fdb9f3e2dcdbde2e5.zip | |
Enable triagebot's merge conflict notifications
| -rw-r--r-- | triagebot.toml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/triagebot.toml b/triagebot.toml index 4b0ad0fb6bb..737aaec79a0 100644 --- a/triagebot.toml +++ b/triagebot.toml @@ -9,6 +9,11 @@ allow-unauthenticated = [ # See https://forge.rust-lang.org/triagebot/shortcuts.html [shortcut] +[merge-conflicts] +add = ['S-waiting-on-author'] +remove = ['S-waiting-on-review'] +unless = ['S-blocked', 'S-final-comment-period'] + # Have rustbot inform users about the *No Merge Policy* [no-merges] exclude_titles = ["Rustup"] # exclude syncs from rust-lang/rust |