tree bd0c8fb3955e9d870eeb250054886586a39fbcd2
parent 05a308a7920e91338b19def702612c98074f1d5d
author Raja Daoud <rdaoud@google.com> 1439400956 -0700
committer Raja Daoud <rdaoud@google.com> 1439400967 -0700

syncbase/vsync: conflict w/o ancestor

Change the initiator's conflict resolver to support the case of conflict
between two versions that have no common ancestor.  This happens when
two Syncbases create the same object (key) before they synchronize.

Change-Id: Ic7c426507d59916dd07c122eef78486ea49705ba