From 38a0e5413c4c57ada0c44fb5bc63a1bd2a13b22a Mon Sep 17 00:00:00 2001
From: dahn <daan@onecht.net>
Date: Mon, 18 May 2026 13:41:00 +0200
Subject: [PATCH] Refactor merge conflict checker workflow

Updated workflow triggers and permissions for merge conflict checker.
---
 .github/workflows/merge-conflict-checker.yml | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/merge-conflict-checker.yml b/.github/workflows/merge-conflict-checker.yml
index 748156a2d9ce..2c826a47c7ec 100644
--- a/.github/workflows/merge-conflict-checker.yml
+++ b/.github/workflows/merge-conflict-checker.yml
@@ -17,16 +17,14 @@
 
 name: "PR Merge Conflict Check"
 on:
-  push:
-  pull_request:
-    types: [opened, synchronize, reopened]
+  schedule:
+    - cron: '*/10 * * * *'
+  workflow_dispatch:
 
-permissions:  # added using https://github.com/step-security/secure-workflows
-  contents: read
+permissions: {}
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: true
+  group: "gh-aw-${{ github.workflow }}"
 
 jobs:
   triage: