cherry-pick: chore(deps): Update rocksdb-js to 1.4.0 (conflicts → v5.0)#883
Merged
Conversation
Regenerated package-lock.json from v5.0 base (1.2.0) instead of hand-resolving the auto-cherry-pick conflict markers, which produced an inconsistent lockfile. Only @harperfast/rocksdb-js and its platform packages change (1.2.0 → 1.4.0). Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
kriszyp
force-pushed
the
cherry-pick/v5.0/pr-875
branch
from
5263200 to
c82fbab
Compare
|
Review the following changes in direct dependencies. Learn more about Socket for GitHub.
|
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
1 participant
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.
Cherry-pick of PR #875 onto `v5.0` produced conflicts on commit(s): `113865c30ca46d5ebe3968d1374b7fec3196c53a`.
Resolve the conflict markers on branch `cherry-pick/v5.0/pr-875` and merge this PR.
@claude please review branch `cherry-pick/v5.0/pr-875` and suggest a patch that resolves the conflict markers (
<<<<<<</=======/>>>>>>>) introduced by cherry-picking PR #875 onto `v5.0`. Post the suggested patch as a comment here — do not push.