Repository navigation
chore: resolve lockfile conflict blocking upmerge to edge - #2069
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>
Co-authored-by: DariuszPorowski <3431813+DariuszPorowski@users.noreply.github.com>
Signed-off-by: GitHub <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
Resolve lockfile conflict blocking upmerge to edge
Oct 29, 2026
DariuszPorowski
approved these changes
Oct 29, 2026
Dependency ReviewThe following issues were found:
OpenSSF Scorecard
Scanned Files
|
DariuszPorowski
enabled auto-merge (squash)
October 29, 2026 03:20
Static Web App Preview
Deployed from commit |
DariuszPorowski
approved these changes
Oct 29, 2026
nicolejms
approved these changes
Oct 29, 2026
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
0.168.0) and PostCSS (^8.5.31) withedge, retaining the registry-URL-free lockfile.edgeand resolve the lockfile conflict without changing release-specific site configuration.Merge without squashing or rebasing: the resolution depends on preserving merge ancestry.
Reason for change
The “upmerge / Upmerge to edge” job failed because
edgeupdated dependencies whilev0.62removed registry URLs from overlapping lockfile entries. Matching versions alone leaves conflicting URL edits; recording the resolved merge addresses both content and ancestry.How to test
With the PR branch checked out and
origin/edgecurrent:git merge-tree --write-tree origin/edge HEAD cd docs npm ci npm run hugo:versionExpect no merge conflicts, successful installation, and Hugo
0.168.0.File change summary
docs/package.jsonedge.docs/package-lock.json.github/scripts/release-docs.shedge..github/scripts/release-docs_test.shedge..github/workflows/lockfile-registry-policy.ymledge..github/workflows/release.yamledge..github/workflows/website.yamledge.docs/content/contributing/contributing-docs/index.mdedge.