Resource upgrades three way merge #1473
Open
Conversation
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
gjenkins8
force-pushed
the
resource_upgrades_three_way_merge
branch
2 times, most recently
from
771470c
to
a62e02c
Compare
Signed-off-by: George Jenkins <gjenkins8@bloomberg.net>
Signed-off-by: George Jenkins <gjenkins8@bloomberg.net>
gjenkins8
force-pushed
the
resource_upgrades_three_way_merge
branch
from
a62e02c
to
a402269
Compare
Signed-off-by: George Jenkins <gjenkins8@bloomberg.net>
|
note to self: should add note about custom resources falling back to jsonpatch |
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.
Lift and shift the details on Helm's three-way merge process from the "Changes from Helm 2 FAQ" into the main documentation. And include details on
--forceflag.Closes: #1448