Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix mz-rocksdb merge conflicts #18819

Merged
merged 1 commit into from
Apr 18, 2023
Merged

fix mz-rocksdb merge conflicts #18819

merged 1 commit into from
Apr 18, 2023

Conversation

guswynn
Copy link
Contributor

@guswynn guswynn commented Apr 18, 2023

fix merge conflicts

@guswynn guswynn requested a review from jkosh44 April 18, 2023 16:41
jkosh44
jkosh44 approved these changes Apr 18, 2023
View reviewed changes
Copy link
Contributor

@jkosh44 jkosh44 left a comment

Choose a reason for hiding this comment

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

LGTM

@guswynn guswynn requested a review from benesch as a code owner April 18, 2023 16:42
@guswynn guswynn enabled auto-merge (rebase) April 18, 2023 16:42
@guswynn guswynn merged commit 253eead into MaterializeInc:main Apr 18, 2023
@materialize-bot materialize-bot mentioned this pull request Apr 21, 2023
Closed
12 tasks
@guswynn guswynn deleted the rocks-merge-conflict branch April 26, 2023 18:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jkosh44 jkosh44 jkosh44 approved these changes

@benesch benesch Awaiting requested review from benesch benesch is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@guswynn @jkosh44