Skip to content

Commit ea76d9a

Browse files
authored
Merge pull request #1012 from WordPress/feature/ghactions-label-merge-conflicts
2 parents de754c1 + a6ea7ee commit ea76d9a

1 file changed

Lines changed: 28 additions & 0 deletions

File tree

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

0 commit comments

Comments
 (0)