Repository navigation
chore: preserve merge ancestry to unblock upmerge to edge - #2070
Merged
Merged
Conversation
…es (#2065) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Co-authored-by: radius-files-sync[bot] <248604391+radius-files-sync[bot]@users.noreply.github.com>
Signed-off-by: GitHub <noreply@github.com> Co-authored-by: DariuszPorowski <3431813+DariuszPorowski@users.noreply.github.com>
Co-authored-by: DariuszPorowski <3431813+DariuszPorowski@users.noreply.github.com>
Copilot
AI
changed the title
[WIP] Fix failing GitHub Actions job upmerge to edge
Preserve merge ancestry to unblock upmerge to edge
Oct 29, 2026
Dependency Review✅ No vulnerabilities or license issues or OpenSSF Scorecard issues found.Scanned FilesNone |
DariuszPorowski
changed the title
DariuszPorowski
marked this pull request as ready for review
October 29, 2026 19:11
DariuszPorowski
approved these changes
Oct 29, 2026
Static Web App Preview
Deployed from commit |
This branch was successfully deployed
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.
Summary
edge, preserving the registry-URL-free lockfile and release configuration.Merge this PR using “Create a merge commit,” not squash or rebase.
Reason for change
The “upmerge / Upmerge to edge” job fails on
docs/package-lock.json. PR #2069 resolved the contents but was squash-merged, discarding the ancestry required to prevent the same conflicts.How to test
Fetch current
edge, then run from the PR checkout:git fetch origin edge:refs/remotes/origin/edge git merge-base --is-ancestor origin/edge HEAD git merge-tree --write-tree origin/edge HEAD bash .github/scripts/release-docs_test.sh cd docs npm ci npm run hugo:versionExpect conflict-free merge validation, passing release tests, successful installation, and Hugo
0.168.0.File change summary
docs/content/contributing/contributing-docs/index.mdThe merge commit records the lockfile resolution without changing its contents.