I will talk about mergeful : A library for synchronising data across
clients via a central server. It handles collaborative agreement of a collection of items with safe merge conflicts.
This work originated in my work on Smos , a comprehensive "Getting Things Done" system in a terminal user interface, that now supports synchronisation across devices. You can read more about it on my blog , where I have a multi-part blog post series about mergeful.