Skip to content

chore: resolve lockfile merge conflicts blocking #427#439

Merged
mpaulosky merged 1 commit into
devfrom
squad/427-lockfile-conflict-fix
Jul 4, 2026
Merged

chore: resolve lockfile merge conflicts blocking #427#439
mpaulosky merged 1 commit into
devfrom
squad/427-lockfile-conflict-fix

Conversation

@mpaulosky

Copy link
Copy Markdown
Owner

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.

Copilot AI review requested due to automatic review settings July 4, 2026 16:37
@mpaulosky
mpaulosky enabled auto-merge (squash) July 4, 2026 16:37
@github-actions github-actions Bot added the squad Squad triage inbox — Lead will assign to a member label Jul 4, 2026
@github-actions

github-actions Bot commented Jul 4, 2026

Copy link
Copy Markdown
Contributor

🏗️ PR Added to Squad Triage Queue

This PR has been labeled with squad and added to the triage queue.

Next steps:

  • The squad Lead will review and assign to an appropriate team member
  • A squad:member label will be added after triage

If you know which squad member should handle this, you can add the appropriate squad:member label yourself.

@mpaulosky
mpaulosky merged commit 377ecb2 into dev Jul 4, 2026
10 of 11 checks passed
@mpaulosky
mpaulosky deleted the squad/427-lockfile-conflict-fix branch July 4, 2026 16:37

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.json to reflect current src/Web/package.json dependencies.
  • Restored a root package-lock.json placeholder to align branches and avoid conflicts.
  • Made a no-op edit to .github/workflows/lint-yaml.yml to 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

codecov Bot commented Jul 4, 2026

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 76.73%. Comparing base (bcd1aae) to head (f0d2a75).
⚠️ Report is 25 commits behind head on dev.

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               

see 1 file with indirect coverage changes

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

squad Squad triage inbox — Lead will assign to a member

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants