From 5e54f16f01c7354d7417046aade8373f8a706830 Mon Sep 17 00:00:00 2001
From: reachableceo <charles@turnsys.com>
Date: Thu, 3 Sep 2026 21:27:31 -0500
Subject: [PATCH] fix(hooks): conflict-marker check false-positived on
 decorative banners [#769]

Same tightening as PFVCluster scripts/check-rules.sh (O&M repo-split round).

https://projects.knownelement.com/issues/769#note-4152
---
 hooks/global/pre-commit | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hooks/global/pre-commit b/hooks/global/pre-commit
index 4804b35..15bbb0a 100755
--- a/hooks/global/pre-commit
+++ b/hooks/global/pre-commit
@@ -24,7 +24,7 @@ while IFS= read -r -d '' f; do
     esac
     [ -f "$REPO_ROOT/$f" ] || continue
 
-    if grep -nE '^(<<<<<<<|=======|>>>>>>>)' "$REPO_ROOT/$f" >/dev/null 2>&1; then
+    if grep -nE '^(<{7}( \S+)?|=======|>{7}( \S+)?)$' "$REPO_ROOT/$f" >/dev/null 2>    if grep -nE '^(<<<<<<<|=======|>>>>>>>)' "$REPO_ROOT/$f" >/dev/null 2>&1; then1; then
         echo "FAIL conflict markers staged in $f" >&2; FAIL=1
     fi
     case "$f" in