Merge Conflict labeller - #7524
Open
realforest2001 wants to merge 1 commit into
Open
Conversation
Comment on lines
+3
to
+5
| push: | ||
| branches: | ||
| - master |
Collaborator
There was a problem hiding this comment.
Suggested change
| push: | |
| branches: | |
| - master |
CheffieGithub
requested changes
Aug 12, 2026
CheffieGithub
left a comment
CheffieGithub
left a comment
Collaborator
There was a problem hiding this comment.
Making it clearer with a request:
The auto labeller needs to not be handling the conflict label
The auto labeller and this need to flow correctly so they don't conflict
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
About The Pull Request
Assuming I did this right it should be more reliable at marking PRs as conflicted.