Merge pull request #4331 from Codeinwp/revert-3813 #1251
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: | |
| - development | |
| jobs: | |
| triage: | |
| runs-on: ubuntu-latest | |
| steps: | |
| - uses: mschilde/auto-label-merge-conflicts@master | |
| with: | |
| CONFLICT_LABEL_NAME: 'has conflicts' | |
| GITHUB_TOKEN: ${{ secrets.BOT_TOKEN }} |