fix(Sync): Do not show conflicts for empty keys #7556
Merged
+32
−31
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.
Highlights:
Problem:
e.g.
Previous version of object:
New version of object:
This should not show up in changes that need to be commited.
Approaches Tested:
Use the VCS to compare against the previous version of an object.
Only update properties of objects in the database if the value of a key is not empty for keys that have a default undefined value
Only handle this for new keys. New keys can be defined as optional.
Comparison between the two approaches:
✅ After discussion with the team we decided to go with the last approach: Models (new keys should be optional and default to undefined)