Resolve Cloud conflicts without duplicate notes (#683) - #733

Merged

adibhanna merged 11 commits into

mainfrom

Sep 4, 2026

Commits on Sep 3, 2026

feat: resolve Cloud bootstrap conflicts in place
adibhanna
committed
06a0f1d
docs: add v2.44.0 conflict resolution release pack
adibhanna
committed
6d25ad0
feat: add durable Cloud conflict resolution engine (#683)
adibhanna
committed
c04d550
feat: guide people through Cloud conflicts (#683)
adibhanna
committed
8ba126d
chore: update audited transitive dependencies
adibhanna
committed
171c7ad
docs: package the v2.44.0 conflict-resolution release
adibhanna
committed
91db535
docs: record complete v2.44.0 verification
adibhanna
committed
017c07c
Fix(cloud-sync): a conflict decision never corrupts, empties, or strands a note
adibhanna
committed
831a03b
Fix(cloud-conflicts): the resolver owns the keyboard and is reachable from anywhere
adibhanna
committed
e6f32ed

Commits on Sep 4, 2026

Feat(editor): grammar and spelling with Harper, off by default
adibhanna
committed
9d39e49
chore(release): 2.44.0
adibhanna
committed
4835a24