Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Handle failed object merge #69

Closed
wants to merge 2 commits into from
Closed

Handle failed object merge #69

wants to merge 2 commits into from

Conversation

beaucollins
Copy link
Contributor

@beaucollins beaucollins commented Nov 2, 2018 •
edited
Loading

See #68

@roundhill
Copy link
Contributor

roundhill commented Nov 8, 2018 •
edited
Loading

I've added the same jsondiff fix here that I put in simperium-android. Still not working properly though... I think we may want to move all of the local modification diffing with a remote change into the applyChange method?

@beaucollins
Copy link
Contributor Author

beaucollins commented Oct 2, 2019 •
edited
Loading

This was fixed/implemented by #61 and #86.

@beaucollins beaucollins closed this Oct 2, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@beaucollins @roundhill