sync: master to develop #41713
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: "Merge Conflict Finder" | |
| on: [push] | |
| jobs: | |
| merge_conflict_job: | |
| runs-on: ubuntu-latest | |
| name: Find merge conflicts | |
| steps: | |
| # Checkout the source code so we have some files to look at. | |
| - uses: actions/checkout@v3 | |
| # Run the actual merge conflict finder | |
| - name: Merge Conflict finder | |
| uses: olivernybroe/[email protected] | |
| with: | |
| exclude_dir: "node_modules/**" |