added polished topaz rod to item list (#265) #1348
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: "Merge Conflict Label" | |
| on: | |
| # So that PRs touching the same files as the push are updated | |
| push: | |
| branches: [ main ] | |
| # So that the `dirtyLabel` is removed if conflicts are resolve | |
| # We recommend `pull_request_target` so that github secrets are available. | |
| # In `pull_request` we wouldn't be able to change labels of fork PRs | |
| pull_request_target: | |
| types: [ opened, synchronize ] | |
| jobs: | |
| conflicts: | |
| runs-on: ubuntu-latest | |
| permissions: | |
| contents: read | |
| pull-requests: write | |
| steps: | |
| - name: Update PRs with conflict labels | |
| uses: eps1lon/actions-label-merge-conflict@releases/2.x | |
| with: | |
| dirtyLabel: "Merge Conflicts" | |
| #removeOnDirtyLabel: "PR: ready to ship" | |
| repoToken: "${{ secrets.GITHUB_TOKEN }}" | |
| commentOnDirty: "This pull request has conflicts with the base branch. Please resolve those so we can evaluate the pull request." | |
| commentOnClean: "Conflicts have been resolved! 🎉 A maintainer will review the pull request shortly." |