crash.software
Projects
Pull Requests
Issues
Builds
dolt
Code
Files
Commits
Branches
Tags
Pull Requests
Code Comments
Code Compare
Issues
List
Boards
Milestones
Builds
Statistics
Contributions
Source Lines
Child Projects
Projects
STRLCPY
dolt
Files
🤬
Sign In
e87a8262
ROOT
/
go
/
libraries
/
doltcore
/
merge
/
merge.go
Search
History
424 lines
|
ISO-8859-1
|
12 KB
Blame
Outline
2
4
8
No wrap
Soft wrap
Outline
ErrFastForward
ErrSameTblAddedTwice
ErrTableDeletedAndModified
ErrSchemaConflict
ErrCantOverwriteConflicts
ErrConflictsIncompatible
ErrMultipleViolationsForRow
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)
checkForConflicts
(tblToStats map[string]*MergeStats)
:
bool
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, )
MergeWouldStompChanges
(ctx context.Context, roots doltdb.Roots, mergeCommit *doltdb.Commit)
:
([]string, map[string]hash.Hash, error)
diffTableHashes
(headTableHashes, otherTableHashes map[string]hash.Hash)
:
map[string]hash.Hash
All occurrences
Please wait...
Page is in error, reload to recover