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
30025a0d
ROOT
/
go
/
store
/
merge
/
three_way.go
Search
History
515 lines
|
ISO-8859-1
|
15 KB
Blame
Outline
2
4
8
No wrap
Soft wrap
Outline
Policy
ResolveFunc
None
(aChange, bChange types.DiffChangeType, a, b types.Value, path types.Path)
:
(change types.DiffChangeType, merged types.Value, ok bool)
Ours
(aChange, bChange types.DiffChangeType, a, b types.Value, path types.Path)
:
(change types.DiffChangeType, merged types.Value, ok bool)
Theirs
(aChange, bChange types.DiffChangeType, a, b types.Value, path types.Path)
:
(change types.DiffChangeType, merged types.Value, ok bool)
ErrMergeConflict
msg
:
string
newMergeConflict
(format string, args ...interface{})
:
*ErrMergeConflict
NewThreeWay
(resolve ResolveFunc)
:
Policy
ThreeWay
(ctx context.Context, a, b, parent types.Value, vrw types.ValueReadWriter, resolve ResolveFunc, progress chan struct{})
:
(merged types.Value, err error)
unmergeable
(a, b types.Value)
:
bool
merger
vrw
:
types.ValueReadWriter
resolve
:
ResolveFunc
progress
:
chan<- struct{}
updateProgress
(progress chan<- struct{})
listAssert
(ctx context.Context, vrw types.ValueReadWriter, a, b, parent types.Value)
:
(aList, bList, pList types.List, ok bool, err error)
mapAssert
(ctx context.Context, vrw types.ValueReadWriter, a, b, parent types.Value)
:
(aMap, bMap, pMap types.Map, ok bool, err error)
refAssert
(ctx context.Context, a, b, parent types.Value, vrw types.ValueReadWriter)
:
(aValue, bValue, pValue types.Value, ok bool, err error)
setAssert
(ctx context.Context, vrw types.ValueReadWriter, a, b, parent types.Value)
:
(aSet, bSet, pSet types.Set, ok bool, err error)
structAssert
(a, b, parent types.Value)
:
(aStruct, bStruct, pStruct types.Struct, ok bool, err error)
*ErrMergeConflict
Error
()
:
string
*merger
threeWay
(ctx context.Context, a, b, parent types.Value, path types.Path)
:
(merged types.Value, err error)
threeWayMapMerge
(ctx context.Context, a, b, parent types.Map, path types.Path)
:
(merged types.Value, err error)
threeWaySetMerge
(ctx context.Context, a, b, parent types.Set, path types.Path)
:
(merged types.Value, err error)
threeWayStructMerge
(ctx context.Context, a, b, parent types.Struct, path types.Path)
:
(merged types.Value, err error)
All occurrences
Please wait...
Page is in error, reload to recover