diff --git a/.github/workflows/label-merge-conflicts.yml b/.github/workflows/label-merge-conflicts.yml new file mode 100644 index 0000000..2f26103 --- /dev/null +++ b/.github/workflows/label-merge-conflicts.yml @@ -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 }}