Update detect-merge-conflicts.yaml

Author: usd877

.github/workflows/detect-merge-conflicts.yaml

@@ -1,24 +1,34 @@
-name: "Detect Merge Conflicts"
+name: Detect Merge Conflicts
+
 on:
-  workflow_dispatch:
   pull_request:
     branches:
-      - dev
-      - master
-      - bugfix
-      - release/*
-      
-  pull_request_target:
-    types: [synchronize]
+      - main
+
+permissions:
+  contents: read  # Чтение содержимого репозитория
+  pull-requests: write  # Запись в pull request для добавления комментариев
 
 jobs:
-  main:
+  detect-conflicts:
     runs-on: ubuntu-latest
+
     steps:
-      - name: check if prs are conflicted
-        uses: eps1lon/actions-label-merge-conflict@1df065ebe6e3310545d4f4c4e862e43bdca146f0 # v3.0.3
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Check for merge conflicts
+        run: |
+          if git merge-base --is-ancestor main HEAD; then
+            echo "No merge conflicts detected."
+          else
+            echo "Merge conflicts detected!"
+            exit 1
+          fi
+
+      - name: Comment on PR if conflicts found
+        if: failure()
+        uses: thollander/actions-comment-pull-request@v1
         with:
-          dirtyLabel: "conflicts-detected"
-          repoToken: "${{ secrets.GITHUB_TOKEN }}"
-          commentOnDirty: "This pull request has conflicts, please resolve those before we can evaluate the pull request."
-          commentOnClean: "Conflicts have been resolved. A maintainer will review the pull request shortly."
+          message: "Merge conflicts have been detected. Please resolve them before merging this PR."
+          token: ${{ secrets.GITHUB_TOKEN }}