Module jj_lib::merge

Generic algorithms for working with merged values, plus specializations for some common types of merged values.

Structs

• Merge
  A generic representation of merged values.
• MergeBuilder
  Helper for consuming items from an iterator and then creating a Merge.

Functions

• trivial_merge
  Attempt to resolve trivial conflicts between the inputs. There must be exactly one more adds than removes.

Type Aliases

• MergedTreeValue
  The value at a given path in a commit. It depends on the context whether it can be absent (Merge::is_absent()). For example, when getting the value at a specific path, it may be, but when iterating over entries in a tree, it shouldn’t be.