Desktop: Fixes #16167: Fix conflict created when syncing a just-published note - #16182

Open

personalizedrefrigerator wants to merge 11 commits into

laurent22:devfrom

personalizedrefrigerator:pr/desktop/fix-conflict-on-publish-only

Commits on Aug 10, 2026

Desktop: Fixes #16167: Fix conflict created when syncing a
personalizedrefrigerator
committed
b28635a
Refactoring
personalizedrefrigerator
committed
45c7371
Add test for setting is_shared=1 recursively
personalizedrefrigerator
committed
37ba58e
Refactoring
personalizedrefrigerator
committed
01a458f
Refactoring
personalizedrefrigerator
committed
13b5731
Refactor test file
personalizedrefrigerator
committed
02822e7
Reword test title
personalizedrefrigerator
committed
c30c52d
Refactoring
personalizedrefrigerator
committed
5b84ef6
Revert changes to sample-fuzzer-setup.json
personalizedrefrigerator
committed
c1708ab
Address CodeRabbit feedback: Avoid setting is_shared=1 for conflicts and deleted notes
personalizedrefrigerator
committed
6c40e58

Commits on Aug 11, 2026

Address code review feedback: Improve error handling
personalizedrefrigerator
committed
67791bf