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.

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

Propagate errors from conflict iterator #4956

Merged
merged 2 commits into from
Nov 23, 2024
Merged

Propagate errors from conflict iterator #4956

merged 2 commits into from
Nov 23, 2024

Conversation

martinvonz
Copy link
Member

Checklist

If applicable:

  • I have updated CHANGELOG.md
  • I have updated the documentation (README.md, docs/, demos/)
  • I have updated the config schema (cli/src/config-schema.json)
  • I have added tests to cover my changes

@martinvonz martinvonz enabled auto-merge (rebase) November 23, 2024 06:52
cli/src/cli_util.rs Outdated Show resolved Hide resolved
I'm about to make the vector contain `BackendResult<MergedTreeValue>`,
which is harder to work with behind a mutable reference.
@martinvonz martinvonz merged commit 10c90a5 into main Nov 23, 2024
31 checks passed
@martinvonz martinvonz deleted the push-twosuuusnmmn branch November 23, 2024 21:53
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