fix 3merge null values#4542
Open
tgzsolt wants to merge 2 commits into
Open
Conversation
tgzsolt
requested review from
efiacor,
kispaljr,
liamfallon and
mozesl-nokia
as code owners
dosubot
Bot
added
size:XS
✅ Deploy Preview for kptdocs ready!
To edit notification comments on pull requests, go to your Netlify project configuration. |
dosubot
Bot
added
size:L
polish update licens Signed-off-by: tar <gabor.tar.ext@nokia.com>
Signed-off-by: tar <gabor.tar.ext@nokia.com>
This file contains hidden or 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
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.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
fix the 3merge for an edge case related to null value
Motivation
3way merge does not use the Updated value for a key if Dest and Origin values both are null.
Fix
Do not return nil (it will delete the key from result) when original value is also null (or the key missing)