src/utils/conflict.js
function solveTree(treeConflict, solved) {
    solved = treeConflict.getConflicts()
    .merge(solved)
    // Solve unresolved conflicts
    .map(function defaultSolve(conflict) {
        if (!conflict.isSolved()) {
            return conflict.keepBase();
        } else {
            return conflict;
        }
    });
    return treeConflict.set('conflicts', solved);
}
function solveTree(treeConflict, solved) {
    solved = treeConflict.getConflicts()
    .merge(solved)
    // Solve unresolved conflicts
    .map(function defaultSolve(conflict) {
        if (!conflict.isSolved()) {
            return conflict.keepBase();
        } else {
            return conflict;
        }
    });
    return treeConflict.set('conflicts', solved);
}
function solveTree ( treeConflict , solved ) { solved = treeConflict . getConflicts ( ) . merge ( solved ) // Solve unresolved conflicts . map ( function defaultSolve ( conflict ) { if ( ! conflict . isSolved ( ) ) { return conflict . keepBase ( ) ; } else { return conflict ; } } ) ; return treeConflict . set ( 'conflicts' , solved ) ; }
Merge solved Conflicts back into a TreeConflict. Unsolved conflicts
default to keep base.
@param {TreeConflict} treeConflict
@param {Map<Path, Conflict>} solved
@return {TreeConflict}
Merge solved Conflicts back into a TreeConflict . Unsolved conflicts default to keep base .