Merge Conflict - Real Region Beside Marker Lookalikes
Documentation about merge conflicts that quotes the markers inside a fenced code block, and then genuinely conflicts further down. A pre-commit hook that greps for `^<<<<<<<` reports two hits and blocks a clean commit; one that understands Markdown fences reports the one that matters.
# Resolving merge conflicts
When two branches change the same lines, git leaves markers in the file:
```text
<<<<<<< HEAD
the version on your branch
=======
the version being merged in
>>>>>>> other-branch
```
Delete the markers and keep the text you want.
## Conflict styles
<<<<<<< HEAD
Set `merge.conflictStyle` to `zdiff3` for the clearest output.
=======
Set `merge.conflictStyle` to `diff3` to see the merge base.
>>>>>>> feature/retry-budget
Both settings are per-repository.
Specifications
- Seed
- 20260807
- Conflict Style
- merge
- Repository Name
- docs/conflicts.md
- Regions
- 1
- Lookalike Regions
- 1
- Lookalike Location
- fenced code block
- Line Endings
- LF
- Encoding
- UTF-8
Testing contract
Expected to pass- Scenario
- Run a conflict-marker check over a document that legitimately quotes conflict markers.
- Expected result
- Exactly one unresolved region is reported — the one under 'Conflict styles' at line 18 — and the quoted block inside the ```text fence is not flagged.
What is a .md file?
Markdown (MD) is a lightweight plain-text markup language that uses simple punctuation conventions to denote headings, lists, links, emphasis, and code. It is designed to be readable as-is and to convert cleanly to HTML. It is widely used for documentation, READMEs, and content authoring.
How to use this file
Use an example Markdown file to test parsers and renderers, verify GitHub-Flavored Markdown extensions like tables and fenced code, and exercise HTML-conversion pipelines.
How to use this file for testing
“Merge Conflict - Real Region Beside Marker Lookalikes” is a deterministic Novus Examples fixture for Error handling, Visual diff / regression, Code parsing. Deliberately corrupt and invalid files, clearly labelled, for testing how your tool fails.
Documented properties for this file: seed 20260807 · UTF-8 · LF. Compare results against paired or grouped companions on this page when present (clean↔damaged, searchable↔scanned, or format twins) so scores stay reproducible across runs.
Download the file once, keep the path stable in CI or local scripts, and treat the spec table as the contract: dimensions, seeds, field lists, and roles are intentional. Corrupt or invalid samples are labelled as such — expect parsers to fail loudly rather than silently accept them.
Diff and patch fixtures name their target paths and the exact edge case they exercise — rename, mode change, binary hunk, CRLF↔LF, or missing trailing newline. Apply or render them against the documented before-state; every author, path, and hash is fictional.
Code examples
import markdown # pip install markdown
html = markdown.markdown(open("marker-lookalikes.md").read())
print(html[:200])Related files
- diffCombined Diff - diff --cc With Two ParentsWhat `git show` prints for a merge commit: a `diff --cc` header, an index line naming three blobs, `@@@` hunk markers, and two prefix columns instead of one. The `++` line is the giveaway a reviewer is looking for — content that appears in the merge result but in neither parent.
- diffCombined Diff - Octopus Merge With Three ParentsAn octopus merge, so the hunk marker grows to `@@@@` and every line carries three prefix columns. Any parser that hard-codes `@@@` or assumes two columns reads the third column as the first character of the line's content.
- diffCombined Diff - Per-Parent mode LineWhen the file mode differs between the parents and the merge result, a combined diff adds a `mode a,b..result` line below the index line — a comma-separated shape that appears nowhere else in git's output. Parsers written for the single-parent `old mode`/`new mode` pair do not recognise it.
- txtMerge Conflict - diff3 Marker Style With Base SectionThe same conflict with `merge.conflictStyle=diff3`, which inserts the merge base between the two sides behind a row of pipes. Tools that split a conflict on `=======` alone silently fold the ancestor text into the ours side.
- txtMerge Conflict - Nested Markers From a Conflicted ResolutionSomeone committed a file that still contained conflict markers, and merging that commit produced markers inside markers. Region matchers that pair the first `<<<<<<<` with the first `=======` split this file in the wrong place and produce two overlapping regions that cannot both be resolved.
- txtMerge Conflict - Three Regions in One FileOne file left with three independent unresolved regions and clean text between them, which is what a real deployment-values merge looks like. Editors that jump to 'the next conflict' and resolvers that report a boolean rather than a count both get exercised here.
Generated by generation/version_control.py. Free for any use, no attribution required — license.