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:

@jrfnl jrfnl added this to the 1.x Next Release milestone 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:
* https://github.com/eps1lon/actions-label-merge-conflict
@jrfnl jrfnl force-pushed the feature/ghactions-add-merge-conflict-workflow branch from beaa443 to eef6e9c Compare May 19, 2025 14:28
@jrfnl jrfnl merged commit ea854f4 into main May 19, 2025
2 checks passed
@jrfnl jrfnl deleted the feature/ghactions-add-merge-conflict-workflow branch May 19, 2025 14:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Development

Successfully merging this pull request may close these issues.

1 participant