[SyncEvolution] git merge strategy (was: RE: Alarms in the calendar: Evolution vs. vcal)