jj_lib::tree

Function try_resolve_file_conflict

Source 
pub async fn try_resolve_file_conflict(
    store: &Store,
    filename: &RepoPath,
    conflict: &MergedTreeVal<'_>,
) -> BackendResult<Option<TreeValue>>
Expand description

Resolves file-level conflict by merging content hunks.

The input conflict is supposed to be simplified. It shouldn’t contain non-file values that cancel each other.