Re: [SyncEvolution] [os-libsynthesis] UID matching during add<->add conflict

> > In the case of iCalendar 2.0 I wonder whether merge=lines is needed. > > For modify/modify conflicts perhaps, but not so much for add/add > > conflicts. Thoughts? > > If you want to differentiate these cases, I'd say we'll need a > MERGEREASON() script function so the script can act differently > depending on why the merge is initiated. So far I see the following > different reasons: slowsync non-perfect match, syncml update conflict, > DB update conflict, DB add conflict. I'm inclined to rather remove the merge=lines and thus keep properties from the winning side in all cases. Except... what if a dumb phone truncates a property and then a slow sync is done? Will the default merge mode preserve the longer property or truncate if the version on the phone happens to be considered "winning"?