Merge branch '2.x' into 3.x #7
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: Check PRs for merge conflicts | |
| on: | |
| # Check for new conflicts due to merges. | |
| push: | |
| branches: | |
| - 'main' | |
| - 1.x | |
| - 2.x | |
| - 3.x | |
| # Check conflicts in new PRs and for resolved conflicts due to an open PR being updated. | |
| pull_request_target: | |
| types: | |
| - opened | |
| - synchronize | |
| - reopened | |
| jobs: | |
| check-prs: | |
| if: github.repository_owner == 'Yoast' | |
| name: Check PRs for merge conflicts | |
| uses: Yoast/.github/.github/workflows/reusable-merge-conflict-check.yml@main |