From 8d0d0cade477c22b3d689692acd0029adf81346b Mon Sep 17 00:00:00 2001 From: Sebastien Monterisi Date: Fri, 17 Apr 2026 17:45:02 +0200 Subject: [PATCH] add ci script to ckeck for git unresolved conflicts --- .github/actions/lint_misc-lint.sh | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/.github/actions/lint_misc-lint.sh b/.github/actions/lint_misc-lint.sh index bb360f0bf74..0dffadafb21 100755 --- a/.github/actions/lint_misc-lint.sh +++ b/.github/actions/lint_misc-lint.sh @@ -5,3 +5,19 @@ vendor/bin/licence-headers-check --ansi --no-interaction vendor/bin/extract-locales 2>&1 | tee extract.log if [[ -n $(grep "warning" extract.log) ]]; then exit 1; fi + +echo "Check for unresolved git merge conflict markers..." +CONFLICT_MATCHES=$(grep -rn '<<<<<<<\|>>>>>>>' \ + --include='*.php' --include='*.twig' --include='*.js' --include='*.ts' --include='*.vue' \ + --include='*.yml' --include='*.yaml' --include='*.css' --include='*.scss' \ + ajax/ bin/ config/ css/ dependency_injection/ front/ inc/ install/ js/ public/ resources/ routes/ src/ templates/ tests/ tools/ \ + | grep -v '^public/lib/' \ + || true) +if [[ -n "$CONFLICT_MATCHES" ]]; then + echo "ERROR: Unresolved git merge conflict markers found:" + echo "$CONFLICT_MATCHES" + exit 1 +else + echo "✓ No unresolved git merge conflict markers found" +fi +