fix: clarify error message (#170) #350
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: Rebase Conflicts | |
| on: | |
| push: | |
| branches: | |
| - master | |
| pull_request: | |
| types: [synchronize] | |
| permissions: | |
| contents: read | |
| pull-requests: write | |
| concurrency: | |
| group: ${{ github.workflow }}-${{ github.ref }} | |
| cancel-in-progress: true | |
| jobs: | |
| conflicts: | |
| name: Check for Conflicts | |
| runs-on: ubuntu-latest | |
| steps: | |
| - name: Label PRs | |
| uses: ExodusMovement/actions-label-merge-conflict@71abef2871620db9447045b06bcd150ed607dc13 | |
| with: | |
| dirtyLabel: 'blocked/needs-rebase' | |
| repoToken: '${{ secrets.GITHUB_TOKEN }}' | |
| commentOnDirty: 'Houston, this is Conflict Bot. We have a conflict. I repeat, we have a conflict. @<%= author %> please rebase. Acknowledge.' | |
| retryAfter: 45 | |
| removeDirtyComment: true |