| commit | 18200c8c0728651f57a9b4c58a143e970148d8f2 | [log] [tgz] |
|---|---|---|
| author | Raja Daoud <rdaoud@google.com> | Wed Aug 12 10:35:56 2015 -0700 |
| committer | Raja Daoud <rdaoud@google.com> | Wed Aug 12 10:36:07 2015 -0700 |
| tree | bd0c8fb3955e9d870eeb250054886586a39fbcd2 | |
| parent | 05a308a7920e91338b19def702612c98074f1d5d [diff] |
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