user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #4116 from RalfJung/merge-conflict

Browse source 
triagebot: enable merge conflict notification
This commit is contained in:
Oli Scherer 2024-12-29 09:00:19 +00:00 • committed by GitHub
commit 6365292028
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/tools/miri/triagebot.toml
View file

@ -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]