Repository navigation
docs: clarify field conflicts in package updates - #4784
Closed
dosubot[bot] wants to merge 1 commit into
Closed
dosubot[bot] wants to merge 1 commit into
dosubot[bot] wants to merge 1 commit into
Conversation
dosubot
Bot
requested review from
a team and
kushnaidu
and
a balanced review from Copilot
October 1, 2026 13:35
dosubot
Bot
requested review from
efiacor,
kispaljr,
liamfallon and
mozesl-nokia
as code owners
October 1, 2026 13:35
✅ Deploy Preview for kptdocs ready!
To edit notification comments on pull requests, go to your Netlify project configuration. |
Contributor
There was a problem hiding this comment.
Copilot review overview
🟢 Approval recommended
The documentation accurately reflects the implemented merge behavior.
Review effort: Balanced
Findings: None
What changed in this PR
Clarifies resource-merge conflict behavior to prevent accidental loss of local customizations.
Changes:
- Documents that upstream values win field conflicts without conflict markers.
- Advises reapplying local values after updates when necessary.
| File | Description |
|---|---|
documentation/content/en/book/07-effective-customizations/_index.md |
Adds conflict-handling guidance for package updates. |
💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
Contributor
|
Will use this content in the other PR. |
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.
Update documentation for #4783
Adds a note explaining that
kpt pkg updateusing the defaultresource-mergestrategy automatically selects the upstream value when both upstream and local edits change the same field. It also advises users to re-apply local values after updating when they need to preserve them.Generated by Dosu