Join GitHub today
GitHub is home to over 50 million developers working together to host and review code, manage projects, and build software together.
Sign upmerge staging #85
Merged
merge staging #85
Conversation
The previous way somtimes merged a record into record with a different objectId somehow. Using Object.values guarantees that the final number of merged records will be the same as the number of unique objectIds. Test plan: 1. Sync to the 'rummy tarp...' group sent by slack DM. 2. You should see a bookmark folder 'f1' with two bookmarks in it; previously the bookmarks would be at the top level. 3. checkout brave/browser-laptop#8480 and run "npm run test -- --grep='^Syncing bookmarks'". the tests should pass.
Fix record merging
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
ayumi commentedApr 27, 2017