From 185b7dab03f8f352014beab0aa5bdbd1234a388f Mon Sep 17 00:00:00 2001
From: kumvijaya <kumvijaya@gmail.com>
Date: Sun, 7 Sep 2025 22:47:07 +0530
Subject: [PATCH] T7748: conflict check workflow updated with increated
 wait/retry

---
 .github/workflows/check-open-prs-conflict.yml | 17 -----------------
 .github/workflows/check-pr-conflicts.yml      |  2 +-
 2 files changed, 1 insertion(+), 18 deletions(-)
 delete mode 100644 .github/workflows/check-open-prs-conflict.yml

diff --git a/.github/workflows/check-open-prs-conflict.yml b/.github/workflows/check-open-prs-conflict.yml
deleted file mode 100644
index 52b11938..00000000
--- a/.github/workflows/check-open-prs-conflict.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-name: "Open PRs Conflicts checker"
-on:
-  push:
-    branches:
-      - current
-      - sagitta
-      - circinus
-  workflow_dispatch:
-
-permissions:
-  contents: read
-  pull-requests: write
-
-jobs:
-  check-pr-conflict-call:
-    uses: vyos/.github/.github/workflows/check-open-prs-conflict.yml@current
-    secrets: inherit
diff --git a/.github/workflows/check-pr-conflicts.yml b/.github/workflows/check-pr-conflicts.yml
index f09e6641..6cca61e8 100644
--- a/.github/workflows/check-pr-conflicts.yml
+++ b/.github/workflows/check-pr-conflicts.yml
@@ -10,5 +10,5 @@ permissions:
 
 jobs:
   check-pr-conflict-call:
-    uses: vyos/.github/.github/workflows/check-pr-merge-conflict.yml@current
+    uses: vyos/.github/.github/workflows/check-pr-conflict.yml@current
     secrets: inherit