diff options
| author | Oli Scherer <github35764891676564198441@oli-obk.de> | 2024-12-29 09:00:19 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-12-29 09:00:19 +0000 |
| commit | 6365292028d79cb8a66dca8a6aa09a7920eb7eb4 (patch) | |
| tree | 05d480fcbda5adcdc7f247cf7ab8955b90f0e670 | |
| parent | 22fd2f39ee201239676e4c3ad3abf3b7d83c65c1 (diff) | |
| parent | 4a43173b676af00f57ee9fbb0b99ee2a52062124 (diff) | |
| download | rust-6365292028d79cb8a66dca8a6aa09a7920eb7eb4.tar.gz rust-6365292028d79cb8a66dca8a6aa09a7920eb7eb4.zip | |
Merge pull request #4116 from RalfJung/merge-conflict
triagebot: enable merge conflict notification
| -rw-r--r-- | src/tools/miri/triagebot.toml | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/tools/miri/triagebot.toml b/src/tools/miri/triagebot.toml index 3192882dff6..4e013764d87 100644 --- a/src/tools/miri/triagebot.toml +++ b/src/tools/miri/triagebot.toml @@ -1,3 +1,6 @@ +## See <https://forge.rust-lang.org/triagebot/index.html> for documentation +## of these options. + [relabel] allow-unauthenticated = [ "A-*", @@ -30,5 +33,10 @@ remove_labels = ["S-waiting-on-author"] # Those labels are added when PR author requests a review from an assignee add_labels = ["S-waiting-on-review"] +[merge-conflicts] +remove = [] +add = ["S-waiting-on-author"] +unless = ["S-blocked", "S-waiting-on-team", "S-waiting-on-review"] + # Automatically close and reopen PRs made by bots to run CI on them [bot-pull-requests] |