Skip to content

Add doc.createMergePair() + do not duck-type << string keys as merge keys - #720

Merged
eemeli merged 2 commits into
mainfrom
merge
Sep 20, 2026
Merged

eemeli merged 2 commits into
mainfrom
merge

Conversation

@eemeli

@eemeli eemeli commented Sep 13, 2026

Copy link
Copy Markdown
Owner

Fixes #718

This is a breaking change for users who've been creating << merge keys manually, as this will now need to get done with the doc.createMergePair(...) that's introduced here, rather than doc.createPair('<<', ...).

Thus far, merge keys have been treated as string values that are special, which was a little broken. Let's instead represent them (internally) with Symbol('<<') values, so that e.g. !!str << and "<<" are always treated as the plain strings that they should be.

@eemeli
eemeli merged commit 6c13734 into main Sep 20, 2026
20 checks passed
@eemeli
eemeli deleted the merge branch September 20, 2026 12:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Explicit string tags on << keys are ignored when merging is enabled

1 participant