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 a1b027d commit 4b174ffCopy full SHA for 4b174ff
.github/workflows/conflict-check.yml
@@ -0,0 +1,22 @@
1
+name: Merge Conflict Check
2
+
3
+on:
4
+ push:
5
+ branches:
6
+ - master
7
+ - 'v*-dev'
8
+ pull_request_target:
9
+ types: [opened, synchronize, reopened]
10
11
+jobs:
12
+ conflict-check:
13
+ runs-on: ubuntu-latest
14
+ permissions:
15
+ pull-requests: write
16
+ steps:
17
+ - name: Check for merge conflicts and label
18
+ uses: eps1lon/actions-label-merge-conflict@v3
19
+ with:
20
+ dirtyLabel: "merge-conflict"
21
+ repoToken: "${{ secrets.GITHUB_TOKEN }}"
22
+ commentOnDirty: "This PR has merge conflicts with the base branch. Please rebase or merge the base branch into your branch to resolve them."
0 commit comments