Adds merge conflict label badge #151
Draft
Conversation
This file contains 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
|
Echo |
Cyberboss
requested changes
Sep 15, 2023
MarkSuckerberg
force-pushed
the
conflict-labels
branch
from
e4d6c48
to
c64c42b
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Basically just dupes the code for "test merge candidate" or similar for "merge conflict" labels which many major codebases who use TGS already have. I'm tired of having to cross-reference the github PRs list to see what conflicts when there's a system that would do the same thing much more conveniently.
Yes, there's another way to check mergeability but that's more complicated and this works fine imo.
Also, yes, this only shows if there's a conflict with the branch it's targeting with no other added PRs, which could lead to some confusion as to why a PR that doesn't have this badge conflicts, but I honestly don't think that's worth comparing to the convenience of knowing which PRs are guaranteed to conflict. I can change it to "Conflicts with target branch" or something if need be.