Merge pull request #2651 from ZeroNetAlpha/RubberReset #2195
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: | |
- master | |
jobs: | |
triage: | |
runs-on: ubuntu-20.04 | |
steps: | |
- uses: mschilde/auto-label-merge-conflicts@2e8fcc76c6430272ec8bb64fb74ec1592156aa6a | |
with: | |
CONFLICT_LABEL_NAME: 'Merge Conflict' | |
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | |
WAIT_MS: 10000 |