-
-
Notifications
You must be signed in to change notification settings - Fork 1.8k
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.
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
Prevent mutable structures when merging Immutable objects using mergeDeep #1840
Merged
Methuselah96
merged 23 commits into
immutable-js:main
from
Methuselah96:fix-undefined-merge-cases
Sep 13, 2021
Merged
Changes from all commits
Commits
Show all changes
23 commits
Select commit
Hold shift + click to select a range
11952b6
Prevent mutable structures when merging Immutable objects
Methuselah96 8e06ea5
Add test for partial conflicts
Methuselah96 6a30077
Override values consistently
Methuselah96 8045f23
Remove failing test
Methuselah96 7591993
Use Seq to determine whether they are indexed or keyed
Methuselah96 a68ea68
Remove unused import
Methuselah96 6ac0924
Simplify wording
Methuselah96 34ca015
Be more strict about mergeability
Methuselah96 ab51c3e
Update documentation
Methuselah96 48183f1
Change wording
Methuselah96 3e9c703
Remove isSet check
Methuselah96 050dfd0
Remove unused import
Methuselah96 e912a1b
Add more test cases
Methuselah96 cbaa071
Add more test cases
Methuselah96 25896fa
Update documentation
Methuselah96 b526da3
Update documentation
Methuselah96 63f4b80
Update documentation
Methuselah96 1ab0cd9
Update documentation
Methuselah96 31e46bd
Update documentation
Methuselah96 6e3be74
Update documentation
Methuselah96 5b43972
Update documentation
Methuselah96 2bd33cb
Update documentation
Methuselah96 be3e91f
Add comments
Methuselah96 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nit: it would still be nice to include a comment block above this function explaining why this implementation determines things are considered mergeable
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done. Let me know if that's what you were thinking or if you were asking for a different explanation.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah this looks good to me. It's the connection between the collection categorization and this somewhat nuanced boolean logic that will be helpful when we look at this function again after our collective memory is lost