CI should reject unresolved merge-conflict markers in docs and config files #415
Description
Summary
CI should reject unresolved merge-conflict markers in docs and config files so these artifacts cannot be merged with placeholder conflict markers that can break tooling and confuse operators.
Related PRs
- None yet
Acceptance Criteria
- Add a CI check (or existing lint job) that fails when files contain unresolved markers like
<<<<<<<,=======,>>>>>>>. - Include docs and config formats in scan scope (e.g.
.md,.yaml,.yml,.toml,.json,.conf,.ini,.env,.sh). - Restrict false positives by allowing conflict-like tokens only inside fenced code blocks that intentionally demonstrate raw merge output.
- Add/update test or fixture coverage proving CI catches unresolved markers.
- Document how to run the check locally and in CI.