.github/workflows/pipeline.yml

@@ -3,8 +3,6 @@ name: CI & CD pipeline
 on:
   push:
     branches: [ main, 'develop', 'dev-*', 'feature/**' ]
-  pull_request:
-    branches: [ main, develop ]
   workflow_dispatch:
     inputs:
       action:
@@ -68,18 +66,6 @@ jobs:
         run: |
           python -m pytest tests/infra/test_prometheus_config.py -v
       
-      - name: Check for merge conflicts
-        if: github.event_name == 'pull_request'
-        run: |
-          echo "🔍 Checking for merge conflicts..."
-          git fetch origin main
-          if ! git merge --no-commit --no-ff origin/main; then
-            echo "❌ Merge conflicts detected!"
-            git merge --abort || true
-            exit 1
-          fi
-          git merge --abort || true
-          echo "✅ No merge conflicts detected"
       
       - name: Upload test results
         if: always()