Kolab 3.0: Conflict Resolution

Hey,

After some pretty long ramblings from my side, I finally have a draft how 
Conflict Resolution might look for Kolab 3.0. You can find the description here:
http://wiki.kolab.org/Conflict_Resolution#Kolab_Conflict_Resolution_Approach:_Clientside_resolution

Note that the page includes a lot more info, including a complete other 
approach "Full History" which has been discarded in favor of Clientside 
resolution. If you're interested feel free to have a look around to see how I 
got here. (#Endless_Resolution_Loop and 
Kolab_Conflict_Resolution_Approach:_Full_history are chapters I spent quite a 
bit of thought on, the rest are mostly leftovers of several iterations). If 
you're just interested in the proposed solution it is safe to read only the 
_Clientside_resolution chapter.

I'm pretty happy with the approach by now, as I think it will provide what we 
need to be able to implement painless handling of conflicts, starting from a 
proper strategy to ensure that conflicts are always detected in the first place 
to a concept how to resolve conflicts using a merge (which I believe will do 
the job in 99% of the cases). Of course all of this can be done while 
guaranteeing that there is no dataloss at all (given all participating clients 
implement the necessary requirements).

Any comments are of course appreciated.

Cheers,
Christian

-- 
Christian Mollekopf
Software Engineer

Kolab Systems AG
Zürich, Switzerland

e: [email protected]
w: http://kolabsys.com

pgp: EA657400 Christian Mollekopf

_______________________________________________
Kolab-devel mailing list
[email protected]
https://www.intevation.de/mailman/listinfo/kolab-devel

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)

iEYEABECAAYFAk+xbYUACgkQF4TVOOpldADVTwCgwD2u1CxY98eNB86rq1+sP9Av
WCoAn2Ls9sicP492peAsWmloaG1LVlrf
=YfPN
-----END PGP SIGNATURE-----