Skip to content

cherry-pick: fix(table): make evict() return a Promise on RocksDB (conflicts → v5.0) - #1093

Merged
kriszyp merged 5 commits into
v5.0from
cherry-pick/v5.0/pr-890
Jun 2, 2026
Merged

cherry-pick: fix(table): make evict() return a Promise on RocksDB (conflicts → v5.0)#1093
kriszyp merged 5 commits into
v5.0from
cherry-pick/v5.0/pr-890

Conversation

@github-actions

@github-actions github-actions Bot commented Jun 2, 2026

Copy link
Copy Markdown
Contributor

Cherry-pick of PR #890 onto `v5.0` produced conflicts on commit(s): `ceeb570567910dea9c962fb7b7b673b9a1c07581 7c6df5d 3284fe4 378d55e 680992b`.

Resolve the conflict markers on branch `cherry-pick/v5.0/pr-890` and merge this PR.

@claude please review branch `cherry-pick/v5.0/pr-890` and suggest a patch that resolves the conflict markers (<<<<<<< / ======= / >>>>>>>) introduced by cherry-picking PR #890 onto `v5.0`. Post the suggested patch as a comment here — do not push.

@kriszyp
kriszyp merged commit fe6466e into v5.0 Jun 2, 2026
11 checks passed
@kriszyp
kriszyp deleted the cherry-pick/v5.0/pr-890 branch June 2, 2026 00:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants