docs(#4556): Add comprehensive 3-way merge guide - #4654
Merged
Conversation
- Create new guide at documentation/content/en/guides/3-way-merge.md - Covers conceptual explanation, merge strategies, worked example, and best practices - Links to technical reference docs to avoid duplication - Includes practical workflow examples for security updates, version migration, and syncing - Add strategic cross-references: - Updated guides/_index.md with link to new guide - Updated reference/cli/pkg/update/_index.md with prominent callout - Added external links for Porch, Git merge, and Kubernetes SMPP - Explains Git integration: kpt uses field-level schema-aware merge vs Git's line-level merge
efiacor
requested review from
kispaljr,
liamfallon and
mozesl-nokia
as code owners
July 21, 2026 17:10
dosubot
Bot
added
the
size:L
✅ Deploy Preview for kptdocs ready!
To edit notification comments on pull requests, go to your Netlify project configuration. |
liamfallon
approved these changes
Jul 27, 2026
aravindtga
approved these changes
Aug 11, 2026
kushnaidu
approved these changes
Aug 11, 2026
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
4 participants
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.
Closes #4556