Module conflicts

Structs

MaterializedFileConflictValue

Conflicted TreeValue::Files with file contents.

MaterializedFileValue

TreeValue::File with file content reader.

MaterializedTreeDiffEntry

Enums

ConflictMarkerStyle

Describes what style should be used when materializing conflicts.

MaterializedTreeValue

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

Constants

MIN_CONFLICT_MARKER_LEN

Minimum length of conflict markers.

Functions

choose_materialized_conflict_marker_len

Given a Merge of files, choose the conflict marker length to use when materializing conflicts.

extract_as_single_hunk

materialize_merge_result

materialize_merge_result_to_bytes

materialize_merge_result_to_bytes_with_marker_len

materialize_merge_result_with_marker_len

materialize_tree_value

Reads the data associated with a MergedTreeValue so it can be written to e.g. the working copy or diff.

materialized_diff_stream

parse_conflict

Parses conflict markers from a slice.

resolve_file_executable

Resolves conflicts in file executable bit, returns the original state if the file is deleted and executable bit is unchanged.

try_materialize_file_conflict_value

Suppose conflict contains only files or absent entries, reads the file contents.

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.