Install a workflow to label PRs with merge conflicts #3850
Merged
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.
Let's try this again...
Label Merge Conflicts is a Github Actions tool that labels and comments on PRs with unresolved merge conflicts. Github very regrettably doesn't provide any visual indication of conflict status in a way that can be searched, filtered, or scanned for, the only way to discover merge conflicts is to open the individual PR page and scroll to the bottom.
Now, every push to the
develop
branch will trigger a workflow run that scans each PR, and if Github indicates that there are conflicts (based on the results of an async detection job that it runs, which are queryable using the Github API) then the designated label is applied. A comment is also left by the workflow. (The comment will generate an email notification for the submitter, something merely adding a label will not do).If conflicts have been resolved, the label should eventually be removed automatically, though due to the async nature of the detection process and etc. there may be a delay. It's reasonable for submitters who have commit access to clear the label on their own if they choose to, once they've completed conflict resolution.