We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
There was an error while loading. Please reload this page.
1 parent 546b6f3 commit d7cc23eCopy full SHA for d7cc23e
.github/workflows/detect-merge-conflicts.yaml
@@ -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