resolve conflicts: #24604 feat(pxe)!: Add AppTaggingSecret kinds to keys in tagging stores - #24874
Closed
PhilWindle wants to merge 1 commit into
Closed
PhilWindle wants to merge 1 commit into
PhilWindle wants to merge 1 commit into
Conversation
Contributor
Author
|
Superseded by #24918 — the v5-next→next backlog is now one time-ordered forward-port PR with a single resolution PR on top, instead of fragmented per-PR pairs (the fragmentation broke commit dependencies). Closing. |
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.
Automated conflict-resolution attempt for #24859 (
fwd-port-24604). Merges next + v5-next PR #24604.Only
docs/docs-developers/docs/resources/migration_notes.mdconflicted. The incoming (v5) side of the hunk was empty: PR #24604's migration note ("### [PXE] Local PXE database is reset on upgrade") already exists in the common region below the markers, since next also carries that note. next's side additionally introduced the## 5.0.1section (with its own new notes) and the## 5.0.0header. Resolution keeps next's## 5.0.1and## 5.0.0headers and preserves PR #24604's note underneath## 5.0.0— union of both, nothing dropped.No generated artifacts were part of this conflict; no regeneration required.
Confidence: high. Review carefully.