diff --git a/.github/workflows/check-merge-conflicts.yml b/.github/workflows/check-merge-conflicts.yml new file mode 100644 index 00000000000..cea6f8618c1 --- /dev/null +++ b/.github/workflows/check-merge-conflicts.yml @@ -0,0 +1,16 @@ +name: "Check merge conflicts" +on: + push: + pull_request_target: + types: [synchronize] + +jobs: + main: + runs-on: ubuntu-latest + steps: + - name: check if prs are dirty + uses: eps1lon/actions-label-merge-conflict@b8bf8341285ec9a4567d4318ba474fee998a6919 + with: + dirtyLabel: "merge-conflicts" + repoToken: "${{ secrets.GITHUB_TOKEN }}" + commentOnDirty: "Hey this pull request has conflicts. Please resolve the merge conflicts with the base branch before we can continue reviewing. Thanks!"