slop/conflict-markers
No merge conflict markers are committed
| Severity | error |
| Tiers | all |
| Stacks | any |
| Scope | root |
| Kind | expr |
| Source | library v0.4.0 |
| Selected by | fleetlint-minimal@v0.4.0 |
Requirement
No file contains a merge conflict marker (<<<<<<< or >>>>>>> at the start of a line), whatever its type. Fenced code blocks in Markdown are not read.
Why
The file does not mean what either side intended; code usually does not compile and configuration silently changes meaning.
Check
For each item in:
grep("**", r'^(<{7}|>{7})( |$)')falseFix
Resolve the conflict and remove the markers.
Agent instruction: Resolve the conflict using both sides’ intent; ask when they contradict.
Sources
- https://github.com/pre-commit/pre-commit-hooks (check, check-merge-conflict)
- https://fleetlint.org/baseline/#slop
- https://fleetlint.org/slop/#repository-and-files
Generated by fleetlint docs from catalog v0.4.0.