chore: resolve lockfile merge conflicts blocking #427#439
Merged
Conversation
mpaulosky
enabled auto-merge (squash)
July 4, 2026 16:37
Contributor
🏗️ PR Added to Squad Triage QueueThis PR has been labeled with Next steps:
|
There was a problem hiding this comment.
Pull request overview
Resolves merge-conflict fallout between dev and main (to unblock PR #427) by restoring consistent lockfile state and making a no-op tweak to the YAML lint workflow so the required yamllint context continues to run.
Changes:
- Reconciled
src/Web/package-lock.jsonto reflect currentsrc/Web/package.jsondependencies. - Restored a root
package-lock.jsonplaceholder to align branches and avoid conflicts. - Made a no-op edit to
.github/workflows/lint-yaml.ymlto keep the workflow context active.
Reviewed changes
Copilot reviewed 1 out of 3 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
src/Web/package-lock.json |
Rebuilt lockfile contents to match the current Web package’s devDependencies. |
package-lock.json |
Adds a minimal root lockfile to reduce merge conflicts between branches. |
.github/workflows/lint-yaml.yml |
No-op workflow change to keep yamllint status context running/available. |
Files not reviewed (1)
- src/Web/package-lock.json: Generated file
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## dev #439 +/- ##
===========================================
- Coverage 87.49% 76.73% -10.77%
===========================================
Files 71 71
Lines 1775 1775
Branches 214 214
===========================================
- Hits 1553 1362 -191
- Misses 145 336 +191
Partials 77 77 🚀 New features to boost your workflow:
|
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.
Resolves the remaining merge conflicts between dev and main identified on PR #427:\n- restore root package-lock.json alignment\n- reconcile src/Web/package-lock.json\n- include a no-op lint-yaml workflow note so required yamllint context runs\n\nAfter this merges, #427 should be conflict-free.