Skip to content

GH Actions: add workflow to label PRs which are in a conflict state #183

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

Merged
merged 1 commit into from
May 19, 2025

Conversation

jrfnl
Copy link
Member

@jrfnl jrfnl commented May 19, 2025

For consistency with the other repos in the organisation.

This commit adds a new workflow which automatically checks for merge conflicts in open PRs.

The selected action runner also has an option to post a comment when a conflict is detected as well as when the conflict has been resolved. While not currently used, this feature might be useful in the future.

Refs:

_For consistency with the other repos in the organisation._

This commit adds a new workflow which automatically checks for merge conflicts in open PRs.

The selected action runner also has an option to post a comment when a conflict is detected as well as when the conflict has been resolved. While not currently used, this feature might be useful in the future.

Refs:
* https://github.com/eps1lon/actions-label-merge-conflict
@jrfnl jrfnl added this to the 1.x Next milestone May 19, 2025
@jrfnl jrfnl merged commit 9a75ac4 into stable May 19, 2025
63 checks passed
@jrfnl jrfnl deleted the feature/ghactions-add-merge-conflict-workflow branch May 19, 2025 12:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant