lib/delta/delta.js
function resolveConflicts(err, syncedNode, callback) {
  if(err) return callback(err);
  if(!syncedNode) return callback(null);

  async.series([
    (cb) => {
      if(syncedNode.directory === true) {
        resolveDirectoryConflicts(syncedNode, cb);
      } else {
        resolveFileConflicts(syncedNode, cb);
      }
    },
    (cb) => {
      findLocalConflict(syncedNode, cb);
    }
  ], (err, res) => {
    if(err) return callback(err);

    callback(null);
  });
}
function resolveConflicts(err, syncedNode, callback) {
  if(err) return callback(err);
  if(!syncedNode) return callback(null);

  async.series([
    (cb) => {
      if(syncedNode.directory === true) {
        resolveDirectoryConflicts(syncedNode, cb);
      } else {
        resolveFileConflicts(syncedNode, cb);
      }
    },
    (cb) => {
      findLocalConflict(syncedNode, cb);
    }
  ], (err, res) => {
    if(err) return callback(err);

    callback(null);
  });
}
function resolveConflicts ( err , syncedNode , callback ) { if ( err ) return callback ( err ) ; if ( ! syncedNode ) return callback ( null ) ; async . series ( [ ( cb ) => { if ( syncedNode . directory === true ) { resolveDirectoryConflicts ( syncedNode , cb ) ; } else { resolveFileConflicts ( syncedNode , cb ) ; } } , ( cb ) => { findLocalConflict ( syncedNode , cb ) ; } ] , ( err , res ) => { if ( err ) return callback ( err ) ; callback ( null ) ; } ) ; }
Resolves conflicts after remote delta actions have been applied

@param {Object|null} err - error object
@param {Object} snycedNode - node with applied actions from database
@param {Function} callback - callback function
@returns {void} - no return value
Resolves conflicts after remote delta actions have been applied