performMerge(ctx *sql.Context, sess *dsess.DoltSession, roots doltdb.Roots, ws *doltdb.WorkingSet, dbName string, spec *merge.MergeSpec, noCommit bool, msg string)
: (*doltdb.WorkingSet, int, int, error)
abortMerge(ctx *sql.Context, workingSet *doltdb.WorkingSet, roots doltdb.Roots)
: (*doltdb.WorkingSet, error)
executeMerge(ctx *sql.Context, squash bool, head, cm *doltdb.Commit, cmSpec string, ws *doltdb.WorkingSet, opts editor.Options)
: (*doltdb.WorkingSet, error)
executeFFMerge(ctx *sql.Context, dbName string, squash bool, ws *doltdb.WorkingSet, dbData env.DbData, cm2 *doltdb.Commit)
: (*doltdb.WorkingSet, error)
executeNoFFMerge(
ctx *sql.Context,
dSess *dsess.DoltSession,
spec *merge.MergeSpec,
dbName string,
ws *doltdb.WorkingSet,
dbData env.DbData,
)
: (*doltdb.WorkingSet, error)
createMergeSpec(ctx *sql.Context, sess *dsess.DoltSession, dbName string, apr *argparser.ArgParseResults, commitSpecStr string)
: (*merge.MergeSpec, error)
mergeRootToWorking(
squash bool,
ws *doltdb.WorkingSet,
mergedRoot *doltdb.RootValue,
cm2 *doltdb.Commit,
cm2Spec string,
mergeStats map[string]*merge.MergeStats,
)
: (*doltdb.WorkingSet, error)