Skip to content

Merge pull request #791 from eisbuk/feature/submission_indication #541

Merge pull request #791 from eisbuk/feature/submission_indication

Merge pull request #791 from eisbuk/feature/submission_indication #541

Workflow file for this run

name: PR Conflict Check
"on":
push:
branches:
- master
- dev
pull_request:
types:
- synchronize
branches:
- master
- dev
jobs:
build:
runs-on: ubuntu-latest
steps:
- name: Check if PRs are dirty
uses: eps1lon/actions-label-merge-conflict@releases/2.x
if: env.LABELING_TOKEN != '' && env.LABELING_TOKEN != null
id: check
with:
dirtyLabel: conflicting
repoToken: ${{ secrets.GITHUB_TOKEN }}
continueOnMissingPermissions: true
commentOnDirty: This pull request has conflicting changes, the author must resolve the conflicts before this pull request can be merged.
commentOnClean: Conflicts have been resolved. A maintainer will take a look shortly.
env:
LABELING_TOKEN: ${{secrets.GITHUB_TOKEN }}