From 441515686395b29e1b5d77cb8d1666351919dbcd Mon Sep 17 00:00:00 2001
From: perl_d <david.perl@psi.ch>
Date: Fri, 27 Feb 2026 13:39:01 +0100
Subject: [PATCH] fix: check for merge conflicts

---
 .gitea/workflows/ci.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml
index 9bf9d59..dd9199f 100644
--- a/.gitea/workflows/ci.yml
+++ b/.gitea/workflows/ci.yml
@@ -53,9 +53,10 @@ jobs:
           ref: "${{ inputs.BEC_PLUGIN_REPO_BRANCH || github.head_ref || github.sha }}"
           path: ./microxas_bec
 
-      - name: Lint for merge conflicts
-        run: |
-          
+      - name: Lint for merge conflicts from template updates
+        shell: bash
+        # Find all Copier conflicts except this line
+        run: '! grep -r "<<<<<<< before updating" | grep -v "grep -r \"<<<<<<< before updating"'
 
       - name: Checkout BEC Core
         uses: actions/checkout@v4