sherwood-logic #42
This file contains hidden or 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: "Detect Merge Conflicts" | |
| on: | |
| # So that PRs touching the same files as the push are updated | |
| push: | |
| # 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: [synchronize] | |
| permissions: read-all | |
| jobs: | |
| main: | |
| runs-on: ubuntu-latest | |
| permissions: | |
| pull-requests: write | |
| issues: write | |
| steps: | |
| - name: check if pull requests have merge conflicts | |
| uses: eps1lon/actions-label-merge-conflict@v3 | |
| with: | |
| dirtyLabel: "rebase-required" | |
| removeOnDirtyLabel: "rebased" | |
| repoToken: "${{ secrets.GITHUB_TOKEN }}" | |
| commentOnDirty: "This pull request has merge conflicts, please resolve them in order to make this pull request ready for review / merge." | |
| commentOnClean: "Thank you for resolving the merge conflicts." |