rust-lang
Labels aren't applied when merge conflicts occur
I think bors is supposed to apply S-waiting-on-author and remove S-waiting-on-review when merge conflicts occur, but it hasn't been happening recently. See some examples here.
See https://github.com/rust-lang/rust-central-station/pull/34 ("Do not change S-waiting-on-review to S-waiting-on-author on merge conflict").
Hmm, well I changed the bors message to tell people to set waiting-on-author and remove waiting-on-review. Maybe we should change bors back so that it modifies labels since it seems like reviewers often wait to review until conflicts are resolved?
If a PR was waiting for review before the merge conflict, it's still waiting for review after.
In most cases merge conflicts do not prevent reviewing and it's not necessary for PR authors to rebase all the time to get reviewer's attention, one rebase in the end before r+ is usually enough.
Sometimes though there can be big changes in the code that require rethinking the implementation of the PR in which case you should rebase before you review more.
If significant changes need to be done due to rebase, which is a rare case, then the reviewer can ask to rebase.
it seems like reviewers often wait to review until conflicts are resolved?
I don't think silently waiting for rebase is a behavior that should be encouraged in reviewers, since rebasing over small changes doesn't affect reviewing at all. If rebase is wanted, then the reviewer can ask for it and change the label.
So perhaps we change the message saying to change the labels? Maybe it could say something like:
[...] If your reviewer applied the
S-waiting-on-authorlabel because of the merge conflicts, you can update the labels once you resolve the conflicts with this command:@rustbot ...
See this thread for more: https://rust-lang.zulipchat.com/#narrow/stream/242269-t-release.2Ftriage/topic/Label.20switching.20for.20outsiders.20is.20hard/near/209176797