Skip to content

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

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.

Sign up for GitHub

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
Merged

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

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions .github/workflows/label-merge-conflicts.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: Check PRs for merge conflicts

on:
# Check for new conflicts due to merges.
push:
branches:
- main
# Check conflicts in new PRs and for resolved conflicts due to an open PR being updated.
pull_request_target:
types:
- opened
- synchronize
- reopened

jobs:
check-prs:
runs-on: ubuntu-latest
if: github.repository_owner == 'PHPCSStandards'

name: Check PRs for merge conflicts

steps:
- name: Check PRs for merge conflicts
uses: eps1lon/actions-label-merge-conflict@v3
with:
dirtyLabel: "Status: has merge conflict"
repoToken: ${{ secrets.GITHUB_TOKEN }}