From f945f5112d842b48ba9b69a7e1a1bb2a054aafef Mon Sep 17 00:00:00 2001
From: Shubham Anand Gupta <81542648+shubhattin@users.noreply.github.com>
Date: Fri, 21 Jun 2024 17:14:31 +0530
Subject: [PATCH] no conflict checker

---
 .github/workflows/merge_conflict.yml | 25 -------------------------
 1 file changed, 25 deletions(-)
 delete mode 100644 .github/workflows/merge_conflict.yml

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!"