Drive Structural changes #1
Workflow file for this run
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 Merge Conflicts | |
| on: | |
| pull_request: | |
| branches: | |
| - main | |
| jobs: | |
| check-conflicts: | |
| runs-on: ubuntu-latest | |
| steps: | |
| - name: Checkout the repository | |
| uses: actions/checkout@v3 | |
| with: | |
| ref: ${{ github.event.pull_request.head.sha }} | |
| fetch-depth: 0 | |
| - name: Fetch main branch | |
| run: git fetch origin main | |
| - name: Check for merge conflicts | |
| run: | | |
| git checkout main | |
| git merge --no-commit --no-ff ${{ github.event.pull_request.head.sha }} || echo "::error::Merge conflict detected!" |