Module merged_tree

A lazily merged view of a set of trees.

Structs

• MergedTree
  Presents a view of a merged set of trees.
• MergedTreeBuilder
  Helper for writing trees with conflicts.
• TreeDiffEntry
  A single entry in a tree diff.
• TreeDiffIterator
  Iterator over the differences between two trees.
• TreeDiffStreamImpl
  Stream of differences between two trees.
• TreeEntriesIterator
  Recursive iterator over the entries in a tree.

Functions

• resolve_file_values
  Tries to resolve file conflicts by merging the file contents. Treats missing files as empty. If the file conflict cannot be resolved, returns the passed values unmodified.

Type Aliases

• TreeDiffStream
  Type alias for the result from MergedTree::diff_stream(). We use a Stream instead of an Iterator so high-latency backends (e.g. cloud-based ones) can fetch trees asynchronously.