function mergeCommit(treeConflict, parents, options) {
    options = options || {};

    const opts = {};

    // Assume the commit is not empty
    opts.empty = false;

    // Parent SHAs
    opts.parents = new Immutable.List(parents);

    opts.author = options.author;
    opts.message = options.message || 'Merged commit';

    // Get the solved tree entries
    const solvedEntries = _getSolvedEntries(treeConflict);
    opts.treeEntries = solvedEntries;

    // Create map of blobs that needs to be created
    const solvedConflicts = treeConflict.getConflicts();
    opts.blobs = solvedEntries.filter((treeEntry) => {
        return !treeEntry.hasSha();
    }).map((treeEntry, path) => {
        return solvedConflicts.get(path).getSolvedContent();
    });

    return CommitBuilder.create(opts);
}
function mergeCommit(treeConflict, parents, options) {
    options = options || {};

    const opts = {};

    // Assume the commit is not empty
    opts.empty = false;

    // Parent SHAs
    opts.parents = new Immutable.List(parents);

    opts.author = options.author;
    opts.message = options.message || 'Merged commit';

    // Get the solved tree entries
    const solvedEntries = _getSolvedEntries(treeConflict);
    opts.treeEntries = solvedEntries;

    // Create map of blobs that needs to be created
    const solvedConflicts = treeConflict.getConflicts();
    opts.blobs = solvedEntries.filter((treeEntry) => {
        return !treeEntry.hasSha();
    }).map((treeEntry, path) => {
        return solvedConflicts.get(path).getSolvedContent();
    });

    return CommitBuilder.create(opts);
}
function mergeCommit ( treeConflict , parents , options ) { options = options || { } ; const opts = { } ; // Assume the commit is not empty opts . empty = false ; // Parent SHAs opts . parents = new Immutable . List ( parents ) ; opts . author = options . author ; opts . message = options . message || 'Merged commit' ; // Get the solved tree entries const solvedEntries = _getSolvedEntries ( treeConflict ) ; opts . treeEntries = solvedEntries ; // Create map of blobs that needs to be created const solvedConflicts = treeConflict . getConflicts ( ) ; opts . blobs = solvedEntries . filter ( ( treeEntry ) => { return ! treeEntry . hasSha ( ) ; } ) . map ( ( treeEntry , path ) => { return solvedConflicts . get ( path ) . getSolvedContent ( ) ; } ) ; return CommitBuilder . create ( opts ) ; }
Create a merge commit builder
@param {TreeConflict} treeConflict The solved TreeConflict
@param {Array<SHA>} parents Parent commits
@param {Author} options.author
@param {String} [options.message='Merge commit']
@return {CommitBuilder}
Create a merge commit builder