fix(ui): resolve merge conflict markers in settings.html and add CI guard

Co-authored-by: christianlouis <361235+christianlouis@users.noreply.github.com>
2026-02-24 17:13:44 +00:00
parent ca6a1af060
commit 66a45703cf
2 changed files with 7 additions and 3 deletions
@@ -46,6 +46,13 @@ jobs:
      - name: Show Ruff version (debug)
        run: ruff --version

+      - name: Check for merge conflict markers
+        run: |
+          if git grep -rn -E '^(<{7} |>{7} |={7}$)' -- '.'; then
+            echo "ERROR: Merge conflict markers found in tracked files."
+            exit 1
+          fi
+
      - name: Run Ruff Lint (check)
        # ruff check can --fix locally, but CI should only check (no modifications)
        run: ruff check app/ tests/