This repository has been archived by the owner on Nov 26, 2020. It is now read-only.
Do not change S-waiting-on-review
to S-waiting-on-author
on merge conflict
#34
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.