fleetlint Policy for a fleet of repositories
v0.7
Getting started

slop/conflict-markers

No merge conflict markers are committed

Severityerror
Tiersall
Stacksany
Scoperoot
Kindexpr
Sourcelibrary v0.4.0
Selected byfleetlint-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})( |$)')
false

Fix

Resolve the conflict and remove the markers.

Agent instruction: Resolve the conflict using both sides’ intent; ask when they contradict.

Sources


Generated by fleetlint docs from catalog v0.4.0.