Skip to content

Merge remote-tracking branch 'bbb/v3.0.x-release' into postgres-oct-31 #984

Merge remote-tracking branch 'bbb/v3.0.x-release' into postgres-oct-31

Merge remote-tracking branch 'bbb/v3.0.x-release' into postgres-oct-31 #984

name: Merge conflict check
on:
push:
pull_request_target:
types:
- opened
- synchronize
permissions:
contents: read
jobs:
main:
permissions:
pull-requests: write # for eps1lon/actions-label-merge-conflict to label PRs
runs-on: ubuntu-latest
concurrency:
group: github-api-request
cancel-in-progress: false
steps:
- name: Check for dirty pull requests
uses: eps1lon/actions-label-merge-conflict@v3
with:
dirtyLabel: "status: conflict"
repoToken: "${{ secrets.GITHUB_TOKEN }}"
commentOnDirty: |
This pull request has conflicts ☹
Please resolve those so we can review the pull request.
Thanks.