Skip to content

Commit 0ca62d1

Browse files
authored
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
2 parents e975563 + 2d119ce commit 0ca62d1

File tree

1 file changed

+0
-3
lines changed

1 file changed

+0
-3
lines changed

triagebot.toml

-3
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@ allow-unauthenticated = [
1010
[shortcut]
1111

1212
[merge-conflicts]
13-
add = ['S-waiting-on-author']
14-
remove = ['S-waiting-on-review']
15-
unless = ['S-blocked', 'S-final-comment-period']
1613

1714
# Have rustbot inform users about the *No Merge Policy*
1815
[no-merges]

0 commit comments

Comments
 (0)