Release: Merge release into master from: release/2.41.2 #22375
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: "Detect Merge Conflicts" | |
| on: | |
| workflow_dispatch: | |
| pull_request: | |
| branches: | |
| - dev | |
| - master | |
| - bugfix | |
| - release/* | |
| pull_request_target: | |
| types: [synchronize] | |
| jobs: | |
| main: | |
| runs-on: ubuntu-latest | |
| steps: | |
| - name: check if prs are conflicted | |
| uses: eps1lon/actions-label-merge-conflict@v3 | |
| with: | |
| dirtyLabel: "conflicts-detected" | |
| repoToken: "${{ secrets.GITHUB_TOKEN }}" | |
| 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." |