feature/end-of-sequence #5

Merged

maximilianbarg merged 4 commits from feature/end-of-sequence into main 2026-09-27 17:06:34 +00:00

Conversation 0 Commits 4 Files changed 3 +79 -6

maximilianbarg commented 2026-09-27 17:05:46 +00:00

Owner

Copy link

No description provided.

maximilianbarg added 4 commits 2026-09-27 17:05:46 +00:00

test: add to structured single line test 1c748d680e

fix: strip trailing newline from base in structured and json output ... a440ddecf9

to_structured rendered conflict units via unit.to_dict(), so the
normalized lines (e.g. 'a\n' instead of 'a') leaked into the JSON
content, and to_json_lines only stripped the versions of a trailing
conflict unit, not its base. to_structured now builds on
to_json_lines(), which strips the final newline from the last unit's
lines, base and versions when the document does not end with one.

Also rename the new test to the test__ naming convention and update
docs/newline-handling.md.

docs: document to_* output formats ... c9375d9d0f

Add docstrings to to_git, to_git_extended, to_structured,
to_json_lines and to_json_string showing the rendered output, the
unit dict shapes, and the trailing-newline behaviour.

Merge branch 'main' into feature/end-of-sequence 7a694bc1a0

maximilianbarg merged commit 4f187748f6 into main 2026-09-27 17:06:34 +00:00

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

Merge pull request 'feature/end-of-sequence' (#5) 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!5

No description provided.