Module conflicts 

Functions

conflict_to_materialized_value

describe_conflict

Give a summary description of a conflict’s “adds” and “removes”

extract_file_conflict_as_single_hunk

Only works if all parts of the conflict are regular, non-executable files

materialize_conflict

materialize_merge_result

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 removed and added inputs to the conflicts. Conflict markers that are otherwise valid will be considered invalid if they don’t have the expected arity.

update_conflict_from_content

Returns None if there are no conflict markers in content.