diff options
| author | Philipp Krones <hello@philkrones.com> | 2025-04-02 16:12:26 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-04-02 16:12:26 +0000 |
| commit | 0ca62d1f507d6d626bc4cd266b095b86f187f6e0 (patch) | |
| tree | c26f51028bd38418301d3484d135b8d4e3e82693 | |
| parent | e975563e00aa93b06c5674bbaf6894593714d8b0 (diff) | |
| parent | 2d119ce5eb7f041e298ab744b4e5d569461b0119 (diff) | |
| download | rust-0ca62d1f507d6d626bc4cd266b095b86f187f6e0.tar.gz rust-0ca62d1f507d6d626bc4cd266b095b86f187f6e0.zip | |
Stop relabelling PRs with merge conflicts (#14521)
r? @flip1995 After seeing some PRs get relabelled I think it's probably for the best not to, a conflict doesn't mean it's no longer waiting for review after all changelog: none
| -rw-r--r-- | triagebot.toml | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/triagebot.toml b/triagebot.toml index 737aaec79a0..a82fb00c0e9 100644 --- a/triagebot.toml +++ b/triagebot.toml @@ -10,9 +10,6 @@ allow-unauthenticated = [ [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] |