MergeCommits(ctx context.Context, commit, mergeCommit *doltdb.Commit, opts editor.Options)
: (*doltdb.RootValue, map[string]*MergeStats, error)
MergeRoots(
ctx context.Context,
ourRoot, theirRoot, ancRoot *doltdb.RootValue,
theirs, ancestor doltdb.Rootish,
opts editor.Options,
mergeOpts MergeOpts,
)
: (*doltdb.RootValue, map[string]*MergeStats, error)
mergeCVsWithStash(ctx context.Context, root *doltdb.RootValue, stash *violationStash)
: (*doltdb.RootValue, error)
getConstraintViolationStats(ctx context.Context, root *doltdb.RootValue, tblToStats map[string]*MergeStats)
: error
MayHaveConstraintViolations(ctx context.Context, ancestor, merged *doltdb.RootValue)
: (bool, error)
GetTablesInConflict(ctx context.Context, roots doltdb.Roots)
: (
workingInConflict, stagedInConflict, headInConflict []string,
err error,
)
GetTablesWithConstraintViolations(ctx context.Context, roots doltdb.Roots)
: (
workingViolations, stagedViolations, headViolations []string,
err error,
)