Skip to content

Commit a6b0baf

Browse files
authored
Merge pull request #519 from PHPCSStandards/feature/ghaction-fix-merge-conflict-status-workflow
GH Actions: update merge conflict check workflow
2 parents 1114d35 + dafe115 commit a6b0baf

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

.github/workflows/label-merge-conflicts.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ jobs:
2020
name: Check PRs for merge conflicts
2121

2222
steps:
23-
- uses: mschilde/auto-label-merge-conflicts@master
23+
- name: Check PRs for merge conflicts
24+
uses: eps1lon/actions-label-merge-conflict@v3
2425
with:
25-
CONFLICT_LABEL_NAME: "Status: has merge conflict"
26-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
26+
dirtyLabel: "Status: has merge conflict"
27+
repoToken: ${{ secrets.GITHUB_TOKEN }}

0 commit comments

Comments
 (0)