fix(hygiene): remove committed conflict markers from 78 files + add CI gate

[lusoris]

Summary

• Removes 123 committed conflict markers across 78 files introduced by sweep commit 24bb5daf89. HEAD side kept in every case — it holds the ADR-0700-correct core/ path refs, the float_ansnr removal (PR feat(core): drop legacy ansnr feature (pre-VMAF, never Netflix-adopted) #38 / ADR-0720), _sanitize_nonfinite function additions, and C++23 safety invariants.
• Adds check-conflict-markers CI job to lint-and-format.yml: a standalone git grep gate that fires on every push and PR, closing the gap for direct pushes and GitHub UI merges that bypass the local pre-commit hook.

Decision: which side to keep

All 78 files, all 123 conflict blocks — keep HEAD. Rationale:

File type	HEAD content	Incoming (24bb5da)
.semgrepignore, CI YAMLs, codeql-config	core/ paths + both old/new for compat	libvmaf/ only (stale pre-ADR-0700)
test_hip_smoke.c	float_ansnr_hip test removed (PR #38)	Still references removed extractor
jsonl_utils.py / registry.py	math import + _sanitize_nonfinite()	Imports missing
All docs/*	New content added by in-flight PRs	Older version without additions

Reproducer / smoke test

git grep -In -e '^<<<<<<< ' -e '^=======$' -e '^>>>>>>> ' \
  -- ':(exclude)LICENSES/**' ':(exclude)*.yuv' ':(exclude)*.pkl' \
     ':(exclude)*.onnx' ':(exclude)*.bin'
# Expected: empty output

How the CI gate works

check-conflict-markers in lint-and-format.yml runs git grep for ^<<<<<<< , ^=======$, ^>>>>>>> over every text file, excluding binary extensions. Pre-commit's check-merge-conflict already covers local commits; this job adds server-side enforcement.

Deliverables checklist

• Changelog fragment: changelog.d/fixed/conflict-marker-sweep-plus-ci-gate.md
• no digest needed: trivial conflict-marker removal
• no decision matrix needed: only one correct resolution (keep HEAD)
• no rebase-sensitive invariants
• smoke-test command in PR description (see above)
• no rebase impact: pure marker removal + additive CI job

Related

• Companion to PR fix(cuda)!: remove committed conflict marker in integer_vif_cuda.c (P0 hotfix) #108 (integer_vif_cuda.c, first instance)
• Companion to PR feat(ci): container supply-chain hardening — distroless, Trivy gate, SBOM, controller publish (ADR-0798) #164 (security-scans.yml + libvmaf-build-matrix.yml, second batch)

🤖 Generated with Claude Code

[lusoris]

Contaminated (100 files) — needs reconstruction, skipping rebase per session policy

[lusoris]

Closing as part of marathon cleanup 2026-05-31 (150 PRs merged today). Content likely superseded by sibling merges. Reopen if specific finding still needs work; bigger PRs preferred going forward per session feedback.

[Copilot]

Pull request overview

This PR removes accidentally committed Git conflict markers (keeping the intended HEAD-side resolutions) and adds a CI workflow gate to prevent future merges/pushes from introducing conflict markers into the repository.

Changes:

• Remove committed merge-conflict markers from CUDA source (example shown in integer_vif_cuda.c).
• Add a changelog entry documenting the conflict-marker cleanup and the new CI enforcement.
• Add a new check-conflict-markers job to the lint-and-format.yml workflow to fail builds if conflict markers are detected.

Reviewed changes

Copilot reviewed 3 out of 3 changed files in this pull request and generated 2 comments.

File	Description
core/src/feature/cuda/integer_vif_cuda.c	Removes committed conflict markers and restores valid C/CUDA syntax.
changelog.d/fixed/conflict-marker-sweep-plus-ci-gate.md	Adds a changelog fragment documenting the cleanup and CI gate.
.github/workflows/lint-and-format.yml	Introduces a CI job intended to block committed conflict markers.

---

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.