When a merge fails, queue the object to be synced again - #203

Merged

roundhill merged 5 commits into

Nov 8, 2018

Commits on Nov 5, 2018

When a merge fails, queue the object to be synced again
beaucollins
committed
1b83001

Commits on Nov 6, 2018

Throw a JSONException if diff match patch didn't apply the patches correctly.
roundhill
committed
dabe159

Commits on Nov 7, 2018

Don't update the object when we encounter an error merging local modifications.
roundhill
committed
1cc28b8
Revert "When a merge fails, queue the object to be synced again"
roundhill
committed
95d5e4e
Adding test for invalid transform exception.
roundhill
committed
08c3034