Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add workflow job to label PRs with conflicts #303

Merged
merged 1 commit into from Dec 16, 2023
Merged

Conversation

ferdnyc
Copy link
Contributor

@ferdnyc ferdnyc commented Dec 16, 2023

A purely take-it-or-leave-it PR, to add a tool that I find helpful in upstream repos. The workflow added by this PR will scan each open PR in the repo, after every change to the source or target branches, and check whether merge conflicts have appeared (or disappeared).

If conflicts are found, it will then both:

  1. Add a comment to the PR, requesting that the conflicts be addressed.
  2. Label the PR with the selected label (Currently set to "conflicts"), so that the presence of conflicts is visible in the PR overview listing.

If prior conflicts have been resolved, it will:

  1. Comment on the PR, thanking the submitter for addressing the issue.
  2. Remove the "conflicts" label.

It's a handy replacement for a feature GitHub should provide themselves, but inexplicably still do not.

IMPORTANT PREREQUISITE

This workflow will not work, unless the label it is configured to use is created manually before merging it.

As I said, the currently-configured label name is conflicts (all-lowercase), which is how the label should be created at https://github.com/pydot/pydot/labels (unless we decide to change it). Color is irrelevant, though I suggest #ff0000 red so that it stands out clearly in the PR list.

@lkk7 lkk7 merged commit 803114c into pydot:master Dec 16, 2023
6 checks passed
@ferdnyc ferdnyc deleted the conflicts branch December 16, 2023 14:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants