diff --git a/.github/workflows/conflicts.yml b/.github/workflows/conflicts.yml new file mode 100644 index 0000000..f28b1cc --- /dev/null +++ b/.github/workflows/conflicts.yml @@ -0,0 +1,13 @@ +on: + push: + pull_request: + types: [opened, synchronize, reopened] +jobs: + check_conflicts: + name: Check for PR merge conflicts + runs-on: ubuntu-latest + steps: + - uses: mschilde/auto-label-merge-conflicts@master + with: + CONFLICT_LABEL_NAME: "conflict" + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}