Merge pull request #812 from eisbuk/fix/order-customer-calendar-slots #556
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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 }} |