fix: check for merge conflicts

2026-02-27 13:39:01 +01:00
parent 9a2fb7d229
commit 4415156863
1 changed files with 4 additions and 3 deletions
@@ -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