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

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
+38 −21

Conversation

martinvonz
Copy link
Owner

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
yuja
yuja approved these changes Nov 23, 2024
View reviewed changes
cli/src/cli_util.rs Outdated Show resolved Hide resolved
@martinvonz
cli_util: take conflicts by value to print_conflicted_paths()
56bc422 
I'm about to make the vector contain `BackendResult<MergedTreeValue>`,
which is harder to work with behind a mutable reference.
@martinvonz
merged_tree: propagate errors from conflict iterator
858d855
@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
Reviewers

@yuja yuja yuja approved these changes

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

Successfully merging this pull request may close these issues.
2 participants
@martinvonz @yuja