Merge pull request #5479 from k0sproject/revert-5376-remove-deprecate… #3230
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: | |
| push: | |
| branches: | |
| - main | |
| - release-* | |
| pull_request_target: | |
| types: | |
| - opened | |
| - reopened | |
| - synchronize | |
| branches: | |
| - main | |
| - release-* | |
| permissions: | |
| contents: read | |
| pull-requests: write | |
| jobs: | |
| main: | |
| runs-on: ubuntu-24.04 | |
| steps: | |
| - name: Check for merge conflicts | |
| uses: eps1lon/actions-label-merge-conflict@v3.0.3 | |
| with: | |
| repoToken: ${{ secrets.GITHUB_TOKEN }} | |
| dirtyLabel: merge-conflict | |
| commentOnDirty: This pull request has merge conflicts that need to be resolved. |