Skip to content

Commit 302ef8a

Browse files
committed
GH Actions: add workflow to auto-label PRs with merge conflicts
1 parent 0c42990 commit 302ef8a

File tree

1 file changed

+27
-0
lines changed

1 file changed

+27
-0
lines changed
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
name: Check PRs for merge conflicts
2+
3+
on:
4+
# Check for new conflicts due to merges.
5+
push:
6+
branches:
7+
- main
8+
# Check conflicts in new PRs and for resolved conflicts due to an open PR being updated.
9+
pull_request_target:
10+
types:
11+
- opened
12+
- synchronize
13+
- reopened
14+
15+
jobs:
16+
check-prs:
17+
runs-on: ubuntu-latest
18+
if: github.repository_owner == 'PHPCSStandards'
19+
20+
name: Check PRs for merge conflicts
21+
22+
steps:
23+
- name: Check PRs for merge conflicts
24+
uses: eps1lon/actions-label-merge-conflict@v3
25+
with:
26+
dirtyLabel: "Status: has merge conflict"
27+
repoToken: ${{ secrets.GITHUB_TOKEN }}

0 commit comments

Comments
 (0)