Module jj_lib::conflicts

source ·

Enums§

  • MaterializedTreeValue
    A type similar to MergedTreeValue but with associated data to include in e.g. the working copy or in a diff.

Functions§

  • extract_as_single_hunk
  • materialize
  • materialize_merge_result
  • materialize_tree_value
    Reads the data associated with a MergedTreeValue so it can be written to e.g. the working copy or diff.
  • parse_conflict
    Parses conflict markers from a slice. Returns None if there were no valid conflict markers. The caller has to provide the expected number of merge sides (adds). Conflict markers that are otherwise valid will be considered invalid if they don’t have the expected arity.
  • update_from_content
    Parses conflict markers in content and returns an updated version of file_ids with the new contents. If no (valid) conflict markers remain, a single resolves FileId will be returned.