[LIB+CLI] Add flag to explicitly preserve null values in merge - #4746
Draft
mozesl-nokia wants to merge 7 commits into
Draft
[LIB+CLI] Add flag to explicitly preserve null values in merge#4746mozesl-nokia wants to merge 7 commits into
null values in merge#4746mozesl-nokia wants to merge 7 commits into
Conversation
Assisted-by: Cursor:grok-4.6 Signed-off-by: Mózes László Máté <laszlo.mozes@nokia.com>
Signed-off-by: Mózes László Máté <laszlo.mozes@nokia.com>
Assisted-by: Cursor:claude-sonnet-5 Signed-off-by: Mózes László Máté <laszlo.mozes@nokia.com>
Signed-off-by: Mózes László Máté <laszlo.mozes@nokia.com>
Signed-off-by: Mózes László Máté <laszlo.mozes@nokia.com> Assisted-by: Cursor:claude-sonnet-5
Assisted-by: Cursor:grok-4.6 Signed-off-by: Mózes László Máté <laszlo.mozes@nokia.com>
Signed-off-by: Mózes László Máté <laszlo.mozes@nokia.com>
❌ Deploy Preview for kptdocs failed. Why did it fail? →
|
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
1 participant
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.
Depends on #4745
Added a new flag that allows you to explicitly preserve
nullvalues during merge3/update/upgrade.The use-case for this is packages that are already meant to be patches themselves. Calling the current merge3 flow on such packages can cause the
nullto get cleared or overridden unintentionally, leading to "combination packages" to inconsistently remove/not remove values.Default behaviour is unchanged.
The flag is supported by the
kpt updatecommand as well, which is persisted into the Kptfile.AI disclosure: Cursor's Grok 4.6 and Claude Sonnet 5 were used for analysis and most of the implementation