Mobile, Desktop, Cli: Resolves #16020: Automatically merge non-overlapping note changes on sync conflicts - #16023

Mobile, Desktop, Cli: Resolves #16020: Automatically merge non-overlapping note changes on sync conflicts#16023

varunkumar-22 wants to merge 42 commits into

laurent22:devlaurent22/joplin:devfrom

varunkumar-22:feat/conflict-auto-merge-v2varunkumar-22/joplin:feat/conflict-auto-merge-v2Copy head branch name to clipboard