Function jj_lib::merged_tree::resolve_file_values

source ยท 
pub fn resolve_file_values(
    store: &Arc<Store>,
    path: &RepoPath,
    values: MergedTreeValue,
) -> BackendResult<MergedTreeValue>
Expand description

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.