Three-way merge model for built-in conflict resolution for CloudKit sync#370

lukaskubanek wants to merge 22 commits into

pointfreeco:mainpointfreeco/sqlite-data:mainfrom

structuredpath:prototype-conflict-resolutionstructuredpath/sqlite-data:prototype-conflict-resolutionCopy head branch name to clipboard