I'm planning on doing an application for mobile and desktop which includes syncing. Since they can be offline, I'll probably get the problem of merging conflicts at some point. Now, this is something one has to handle on his own - in this case, the user.
How would you prevent this from happening and if it does how would you present it to the user? Just show the difference and let them decide?