printSuccessStats(tblToStats map[string]*merge.MergeStats)
: (conflicts bool, constraintViolations bool)
printConflictsAndViolations(tblToStats map[string]*merge.MergeStats)
: (conflicts bool, constraintViolations bool)
handleMergeErr(ctx context.Context, dEnv *env.DoltEnv, mergeErr error, hasConflicts, hasConstraintViolations bool, usage cli.UsagePrinter)
: int
performMerge(ctx context.Context, dEnv *env.DoltEnv, spec *merge.MergeSpec, suggestedMsg string)
: (map[string]*merge.MergeStats, error)
executeNoFFMergeAndCommit(ctx context.Context, dEnv *env.DoltEnv, spec *merge.MergeSpec, suggestedMsg string)
: (map[string]*merge.MergeStats, error)
executeMergeAndCommit(ctx context.Context, dEnv *env.DoltEnv, spec *merge.MergeSpec, suggestedMsg string)
: (map[string]*merge.MergeStats, error)