From 60487b5488001f179a24d641b48c2a6b614804b8 Mon Sep 17 00:00:00 2001 From: Andrey Date: Sun, 25 Jan 2026 19:51:23 +0300 Subject: [PATCH] some fix agaaain --- .github/workflows/pipeline.yml | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml index 9532aa4..be698e9 100644 --- a/.github/workflows/pipeline.yml +++ b/.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()