Skip to content

Manual cherry-pick needed: fix: sync lockfile to match bumped package.json  #69

@github-actions

Description

@github-actions

Manual Cherry-pick Required

The automatic cherry-pick of #68 to main failed due to merge conflicts.

Original PR

Manual Cherry-pick Instructions

# Checkout main branch
git checkout main
git pull origin main

# Create a new branch for the cherry-pick
git checkout -b cherry-pick-pr-68

# Cherry-pick the commit (use -m 1 for merge commits)
git cherry-pick 66258ac53c3c64c99bd39af7fce55b445b33bc72
# OR for merge commits:
# git cherry-pick -m 1 66258ac53c3c64c99bd39af7fce55b445b33bc72

# Resolve conflicts manually, then:
git add .
git cherry-pick --continue

# Push and create PR
git push origin cherry-pick-pr-68
gh pr create --base main --title "Cherry-pick: fix: sync lockfile to match bumped package.json "

Decision Required

  • Cherry-pick is needed - resolve conflicts and apply
  • Cherry-pick is NOT needed - close this issue

This issue was automatically created by the cherry-pick workflow.

Metadata

Metadata

Assignees

Type

No type
No fields configured for issues without a type.

Projects

No projects

Milestone

No milestone

Relationships

None yet

Development

No branches or pull requests

Issue actions