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
0324e075
ROOT
/
go
/
libraries
/
doltcore
/
conflict
/
conflict.go
Search
History
162 lines
|
ISO-8859-1
|
3 KB
Blame
Outline
2
4
8
No wrap
Soft wrap
Outline
ConflictSchema
Base
:
schema.Schema
Schema
:
schema.Schema
MergeSchema
:
schema.Schema
NewConflictSchema
(base, sch, mergeSch schema.Schema)
:
ConflictSchema
ValueFromConflictSchema
(ctx context.Context, vrw types.ValueReadWriter, cs ConflictSchema)
:
(types.Value, error)
ConflictSchemaFromValue
(ctx context.Context, vrw types.ValueReadWriter, v types.Value)
:
(cs ConflictSchema, err error)
serializeSchema
(ctx context.Context, vrw types.ValueReadWriter, sch schema.Schema)
:
(types.Ref, error)
deserializeSchema
(ctx context.Context, vrw types.ValueReadWriter, v types.Value)
:
(schema.Schema, error)
Conflict
Base
:
types.Value
Value
:
types.Value
MergeValue
:
types.Value
ToNomsList
(vrw types.ValueReadWriter)
:
(types.Tuple, error)
NewConflict
(base, value, mergeValue types.Value)
:
Conflict
ConflictFromTuple
(tpl types.Tuple)
:
(Conflict, error)
All occurrences
Please wait...
Page is in error, reload to recover