From a0c01ad51c8ceed1e480cd6a9cdaf76c72a0edd3 Mon Sep 17 00:00:00 2001
From: perl_d <david.perl@psi.ch>
Date: Fri, 27 Feb 2026 15:49:26 +0100
Subject: [PATCH] Update repo with template version v1.2.8

---
 .copier-answers.yml     | 2 +-
 .gitea/workflows/ci.yml | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.copier-answers.yml b/.copier-answers.yml
index a19ed29..aca6fb6 100644
--- a/.copier-answers.yml
+++ b/.copier-answers.yml
@@ -2,7 +2,7 @@
 # It is needed to track the repo template version, and editing may break things.
 # This file will be overwritten by copier on template updates.
 
-_commit: v1.2.7
+_commit: v1.2.8
 _src_path: https://github.com/bec-project/plugin_copier_template.git
 make_commit: false
 project_name: superxas_bec
diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml
index 7dcc627..b26009c 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: ./superxas_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