feature/end-of-sequence #3

Merged

maximilianbarg merged 4 commits from feature/end-of-sequence into main 2026-09-27 16:35:31 +00:00

Conversation 0 Commits 4 Files changed 8 +178 -15

maximilianbarg commented 2026-09-27 16:34:24 +00:00

Owner

Copy link

No description provided.

maximilianbarg added 4 commits 2026-09-27 16:34:24 +00:00

test: add tests for line endings by sequences 185b08069a

feat: remove suffix for none end of line to prevent created end of line 1cff5d3f1c

fix: keep trailing newline based on input documents ... 0534450cb6

The unconditional removesuffix in to_git, to_git_extended and
to_structured dropped a trailing newline even when the input
documents ended with one. Units now carries an ends_with_newline
flag (set from the parsed string, inherited from ours/theirs in
_merge_units since the base never counts as a version) and the
renderers only strip the final newline when it is False.

Also fixes to_json_lines crashing with KeyError when the last unit
is a conflict unit and with IndexError on an empty document.

docs: document newline handling decision ... 3831664723

Add docs/newline-handling.md explaining the architectural decision:
lines are normalized at parse time (a trailing newline is appended so
difflib line identity and conflict block output stay well-formed) and
the original trailing-newline state is carried in
Units.ends_with_newline, applied by the to_* renderers. Link the doc
from the README and add docs/ to the project layout in README and
AGENTS.md.

maximilianbarg merged commit 294b834f54 into main 2026-09-27 16:35:31 +00:00

maximilianbarg referenced this pull request from a commit 2026-09-27 16:35:32 +00:00

Merge pull request 'feature/end-of-sequence' (#3) from feature/end-of-sequence into main

Sign in to join this conversation.

Reviewers

No reviewers

Labels

Clear labels

No items

No labels

Milestone

Clear milestone

No items

No milestone

Projects

Clear projects

No items

No project

Assignees

Clear assignees

No assignees

1 participant

Notifications

Subscribe

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set

Reference

maximilianbarg/n-way-merge!3

No description provided.