On Fri, Mar 06, 2009 at 08:23:21PM +0000, Brian Candler wrote: > At the moment there's no front-end which makes this process half decent. In > any case, any "generic" front-end could, at best, show you all the versions > side by side and ask you to pick the right one by hand, as it has no way of > knowing which is the best one. It can't even do what Unison does, which is > to assume that if the document changed at side A but didn't change at side > B, then side A is the preferred one. > > Alternatively, you could try to have automatic resolution. This is > application-specific, that's to say, specific to the format of the JSON > documents in question, and what extra fields they may or may not include for > this purpose (such as timestamps). There's no framework in place where you > can plug in conflict-resolution rules yet, so everyone has to build their > own, externally.
This feels like a good place to say "patches welcome" with a wink and a smile. -- Noah Slater, http://tumbolia.org/nslater
