Merge branch 'main' into 771-pass-through-resolve_path-when-not-acces… #1653
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
| # This workflow will check pull requests for merge conflicts and | |
| # automatically add (and remove) a relevant label | |
| name: identify 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 resolved | |
| pull_request_target: | |
| types: [synchronize] | |
| jobs: | |
| label: | |
| runs-on: ubuntu-latest | |
| steps: | |
| - name: Label Conflicting Pull Requests | |
| uses: eps1lon/actions-label-merge-conflict@1b1b1fcde06a9b3d089f3464c96417961dde1168 | |
| with: | |
| dirtyLabel: "PR: merge conflicts" | |
| repoToken: ${{ secrets.GITHUB_TOKEN }} |