diff --git a/.github/workflows/autofix.yml b/.github/workflows/autofix.yml index b9e74e678..f290d020e 100644 --- a/.github/workflows/autofix.yml +++ b/.github/workflows/autofix.yml @@ -19,6 +19,13 @@ jobs: - name: Checkout Repository uses: actions/checkout@v6 + - name: Check for merge conflict markers + run: | + if git grep -nEI '<{7} |>{7} |^={7}$' -- ':(exclude)*.md' ':(exclude)*.mdx'; then + echo "::error::Merge conflict markers found in tracked files" + exit 1 + fi + - name: Install pnpm uses: pnpm/action-setup@v6 diff --git a/apps/web/index.html b/apps/web/index.html index 1513667f2..fc8d2c817 100644 --- a/apps/web/index.html +++ b/apps/web/index.html @@ -19,7 +19,46 @@