On Mon, Apr 18, 2011 at 4:59 PM, Dan Reverri <d...@basho.com> wrote: > Hi Bryan, > This is an excellent question and one of the more difficult areas of Riak to > understand. The source of confusion in this situation is vector clocks. Riak > maintains a vector clock for every object which is used to track different > versions of the object and potentially auto-repair out-of-sync data. > I recommend reviewing this page in the wiki: > > https://wiki.basho.com/Vector-Clocks.html [...]
I actually had a question about that page. Why is it that when there is a conflict we can only get the conflicting versions of the data? If I'm going to try to resolve the conflict intelligently, I really want the common ancestor as well so that I can try to do a 3-way merge. Ben _______________________________________________ riak-users mailing list riak-users@lists.basho.com http://lists.basho.com/mailman/listinfo/riak-users_lists.basho.com