Skip to content

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 merged commit f50dbd5 into stable May 19, 2025
10 checks passed
@jrfnl jrfnl deleted the feature/ghactions-add-merge-conflict-workflow branch May 19, 2025 12:58
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.

2 participants