From 36679c266983fdd07978a9ecd518782788600dd0 Mon Sep 17 00:00:00 2001
From: Gas Town Mayor <mayor@datacosmos.com>
Date: Fri, 28 Aug 2026 17:46:21 -0300
Subject: [PATCH] fix(flext): stabilize from clean 0.12.0-dev with conflict
 marker CI check
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

**Análise:**
- Repo estava em detached HEAD (.git/HEAD apontava para branch inexistente 'wip/session-suspend-20260824/aihub-audit')
- Nenhum broken merge ou conflict marker no 0.12.0-dev (origin)
- 31 submodules, 4 CI workflows existentes
- CI: 5 workflows (4 existentes + 1 nova: conflict-marker-check)
---
 .github/workflows/conflict-marker-check.yml | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 .github/workflows/conflict-marker-check.yml

diff --git a/.github/workflows/conflict-marker-check.yml b/.github/workflows/conflict-marker-check.yml
new file mode 100644
index 000000000..14f308709
--- /dev/null
+++ b/.github/workflows/conflict-marker-check.yml
@@ -0,0 +1,20 @@
+name: conflict-marker-check
+
+on:
+  pull_request:
+
+jobs:
+  conflict-markers:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Check for merge conflict markers
+        run: |
+          markers=$(git grep -l '<<<<<<< HEAD\|=======$' -- \
+            $(git ls-files | grep -vE '\.venv/|node_modules/|dist/|build/|\.cache/|_vendor/' | tr '\n' ' ') 2>/dev/null || true)
+          if [ -n "$markers" ]; then
+            echo "::error::Merge conflict markers found in tracked files:"
+            echo "$markers"
+            exit 1
+          fi
+          echo "No conflict markers found."