tgstation / tgstation-server-webpanel

React application for interacting with tgstation-server
GNU Affero General Public License v3.0
10 stars 11 forks source link

Adds merge conflict label badge #151

Open MarkSuckerberg opened 11 months ago

MarkSuckerberg commented 11 months ago

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.

Cyberboss commented 11 months ago

Echo image