Skip to content

Commit d7cc23e

Browse files
add Detect Merge Conflicts workflow
1 parent 546b6f3 commit d7cc23e

File tree

1 file changed

+23
-0
lines changed

1 file changed

+23
-0
lines changed
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
name: "Detect Merge Conflicts"
2+
on:
3+
workflow_dispatch:
4+
push:
5+
branch:
6+
- dev
7+
- master
8+
- release/*
9+
10+
pull_request_target:
11+
types: [synchronize]
12+
13+
jobs:
14+
main:
15+
runs-on: ubuntu-latest
16+
steps:
17+
- name: check if prs are conflicted
18+
uses: eps1lon/actions-label-merge-conflict@releases/2.x
19+
with:
20+
dirtyLabel: "conflicts-detected"
21+
repoToken: "${{ secrets.GITHUB_TOKEN }}"
22+
commentOnDirty: "This pull request has conflicts, please resolve those before we can evaluate the pull request."
23+
commentOnClean: "Conflicts have been resolved. A maintainer will review the pull request shortly."

0 commit comments

Comments
 (0)