Fix resin doors not closing on mob/living if they are merged with wee… #16730
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 | |
| pull_request_target: | |
| types: [ready_for_review, opened, synchronize, reopened] | |
| jobs: | |
| triage: | |
| runs-on: ubuntu-latest | |
| steps: | |
| - uses: eps1lon/[email protected] | |
| with: | |
| dirtyLabel: 'Merge Conflict' | |
| commentOnDirty: "This pull request has conflicts, please resolve those before we can evaluate the pull request." | |
| commentOnClean: "Conflicts have been resolved. A maintainer will review the pull request shortly." | |
| repoToken: ${{ secrets.BOT_TOKEN_CM || secrets.GITHUB_TOKEN }} |