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
/
action.go
Search
History
256 lines
|
ISO-8859-1
|
7 KB
Blame
Outline
2
4
8
No wrap
Soft wrap
Outline
ErrFailedToDetermineUnstagedDocs
ErrFailedToReadDatabase
ErrMergeFailedToUpdateDocs
ErrMergeFailedToUpdateRepoState
ErrFailedToDetermineMergeability
MergeSpec
HeadH
:
hash.Hash
MergeH
:
hash.Hash
HeadC
:
*doltdb.Commit
MergeC
:
*doltdb.Commit
MergeCSpecStr
:
string
StompedTblNames
:
[]string
WorkingDiffs
:
map[string]hash.Hash
Squash
:
bool
Msg
:
string
Noff
:
bool
NoCommit
:
bool
NoEdit
:
bool
Force
:
bool
AllowEmpty
:
bool
Email
:
string
Name
:
string
Date
:
time.Time
NewMergeSpec
(ctx context.Context, rsr env.RepoStateReader, ddb *doltdb.DoltDB, roots doltdb.Roots, name, email, msg, commitSpecStr string, squash, noff, force, noCommit, noEdit bool, date time.Time)
:
(*MergeSpec, error)
ExecNoFFMerge
(ctx context.Context, dEnv *env.DoltEnv, spec *MergeSpec)
:
(map[string]*MergeStats, error)
applyChanges
(ctx context.Context, root *doltdb.RootValue, workingDiffs map[string]hash.Hash)
:
(*doltdb.RootValue, error)
ExecuteFFMerge
( ctx context.Context, dEnv *env.DoltEnv, spec *MergeSpec, )
:
error
ExecuteMerge
(ctx context.Context, dEnv *env.DoltEnv, spec *MergeSpec)
:
(map[string]*MergeStats, error)
mergedRootToWorking
( ctx context.Context, squash bool, dEnv *env.DoltEnv, mergedRoot *doltdb.RootValue, workingDiffs map[string]hash.Hash, cm2 *doltdb.Commit, cm2SpecStr string, tblToStats map[string]*MergeStats, )
:
error
conflictsAndViolations
(tblToStats map[string]*MergeStats)
:
(conflicts []string, constraintViolations []string)
All occurrences
Please wait...
Page is in error, reload to recover