diff --git a/.github/workflows/merge_conflict.yml b/.github/workflows/merge_conflict.yml deleted file mode 100644 index 9346b30..0000000 --- a/.github/workflows/merge_conflict.yml +++ /dev/null @@ -1,25 +0,0 @@ -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!"