chore: regenerate pnpm-lock.yaml from main to resolve merge conflicts#640
Merged
JustAGhosT merged 2 commits intoclaude/implement-orchestration-qazjWfrom Feb 23, 2026
Merged
Conversation
Co-authored-by: JustAGhosT <5531814+JustAGhosT@users.noreply.github.com>
Copilot
AI
changed the title
[WIP] Refactor marketing pages to client components and add tests
chore: regenerate pnpm-lock.yaml from main to resolve merge conflicts
Feb 23, 2026
|
Azure Static Web Apps: Your stage site is ready! Visit it here: https://ambitious-sand-0ef6ce10f-640.eastus2.3.azurestaticapps.net |
|
🚀 Azure Static Web Apps Preview (Marketing) ✅ Deployment complete! Preview URL: https://ambitious-sand-0ef6ce10f-640.eastus2.3.azurestaticapps.net This preview will be automatically deleted when the PR is closed. |
JustAGhosT
merged commit 5ede6f0
into
claude/implement-orchestration-qazjW
4 checks passed
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.
claude/implement-orchestration-qazjWhad 21 merge conflicts inpnpm-lock.yamlblocking merge intomain.Changes
pnpm-lock.yamlmain— fetched main's lockfile as the base before runningpnpm install --no-frozen-lockfile, so resolved versions stay aligned with main wherever possiblee2eworkspace (@playwright/test@1.58.2)@vitest/coverage-v8in marketingeslint-plugin-security ^3.0.1(vs^4.0.0on main)tailwindcss ^4.1.18(vs^4.2.0on main)Diff from main reduced from ~10,178 lines → ~440 lines; no conflict markers remain.
🔒 GitHub Advanced Security automatically protects Copilot coding agent pull requests. You can protect all pull requests by enabling Advanced Security for your repositories. Learn more about Advanced Security.