Merge pull request #1567 from pi-hole/dependabot/pip/test/pip-150d523057 #770
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: "Check for merge conflicts" | |
| on: | |
| # So that PRs touching the same files as the push are updated | |
| push: | |
| # So that the `dirtyLabel` is removed if conflicts are resolve | |
| # We recommend `pull_request_target` so that github secrets are available. | |
| # In `pull_request` we wouldn't be able to change labels of fork PRs | |
| pull_request_target: | |
| types: [synchronize] | |
| jobs: | |
| main: | |
| runs-on: ubuntu-latest | |
| steps: | |
| - name: Check if PRs are have merge conflicts | |
| uses: eps1lon/actions-label-merge-conflict@v2.1.0 | |
| with: | |
| dirtyLabel: "Merge Conflict" | |
| repoToken: "${{ secrets.GITHUB_TOKEN }}" | |
| commentOnDirty: "This pull request has conflicts, please resolve those before we can evaluate the pull request." | |
| commentOnClean: "Conflicts have been resolved." |