More biome fixes #278
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: Merge Conflict Detection | |
| on: | |
| push: | |
| branches: [main] | |
| pull_request_target: | |
| types: [synchronize] | |
| permissions: | |
| contents: read | |
| pull-requests: write | |
| jobs: | |
| detect-conflicts: | |
| name: Detect Merge Conflicts | |
| runs-on: ubuntu-latest | |
| steps: | |
| - name: Check for merge conflicts | |
| uses: eps1lon/actions-label-merge-conflict@v3 | |
| with: | |
| dirtyLabel: "conflict" | |
| repoToken: ${{ secrets.GITHUB_TOKEN }} | |
| commentOnDirty: "This PR has merge conflicts that need to be resolved before it can be merged. Please rebase on the latest `main` branch." | |
| commentOnClean: "Merge conflicts have been resolved." |