maximilianbarg/n-way-merge
Watch
1
0
Fork
You've already forked n-way-merge
 0
Code Issues 1 Pull requests Projects Releases 3 Packages 1 Wiki Activity Actions

feat: keep conflicts when merging versions one at a time #1

Merged
maximilianbarg merged 1 commit from feature/incremental-merge-conflicts into main 2026-09-27 11:17:32 +00:00
Conversation 0 Commits 1 Files changed 3 +168 -17
maximilianbarg commented 2026-09-27 11:13:39 +00:00
Owner
Copy link

Read pre-existing conflict blocks from base, ours and theirs (not only
from base) so an accumulated result preserves its conflicts even when the
base is the original, conflict-free document. This makes incremental
merging (merge(base, current, next)) accumulate n versions like the
varargs form, instead of silently dropping earlier versions.

Add a unit test for the three-user case and document the one-at-a-time
use case in the README.

Read pre-existing conflict blocks from base, ours and theirs (not only from base) so an accumulated result preserves its conflicts even when the base is the original, conflict-free document. This makes incremental merging (merge(base, current, next)) accumulate n versions like the varargs form, instead of silently dropping earlier versions. Add a unit test for the three-user case and document the one-at-a-time use case in the README.
feat: keep conflicts when merging versions one at a time
All checks were successful
Tests / test (3.11) (pull_request) Successful in 4s
Details
Tests / test (3.13) (pull_request) Successful in 4s
Details
Tests / test (3.12) (pull_request) Successful in 4s
Details
Tests / test (3.14) (pull_request) Successful in 3s
Details
dad2ef5300 
Read pre-existing conflict blocks from base, ours and theirs (not only
from base) so an accumulated result preserves its conflicts even when the
base is the original, conflict-free document. This makes incremental
merging (merge(base, current, next)) accumulate n versions like the
varargs form, instead of silently dropping earlier versions.

Add a unit test for the three-user case and document the one-at-a-time
use case in the README.
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
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!1
No description provided.