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
9becfc9d
ROOT
/
go
/
libraries
/
doltcore
/
merge
/
conflict_reader.go
Search
History
323 lines
|
ISO-8859-1
|
8 KB
Blame
Outline
2
4
8
No wrap
Soft wrap
Outline
oursStr
theirsStr
baseStr
ConflictDiffTypeAdded
ConflictDiffTypeModified
ConflictDiffTypeRemoved
ConflictReader
confItr
:
types.MapIterator
joiner
:
*rowconv.Joiner
sch
:
schema.Schema
nbf
:
*types.NomsBinFormat
keyless
:
bool
NewConflictReader
(ctx context.Context, tbl *doltdb.Table, tblName string)
:
(*ConflictReader, error)
setCardinalities
(base, ours, theirs types.Uint, joinedRow row.Row, sch schema.Schema)
:
(row.Row, error)
getDiffType
(base types.Value, other types.Value)
:
string
*ConflictReader
GetSchema
()
:
schema.Schema
GetJoiner
()
:
*rowconv.Joiner
NextConflict
(ctx context.Context)
:
(row.Row, error)
pkJoinedRow
(key types.Tuple, conflict conflict.Conflict)
:
(row.Row, error)
keylessJoinedRow
(key types.Tuple, conflict conflict.Conflict)
:
(row.Row, error)
GetKeyForConflict
(ctx context.Context, r row.Row)
:
(types.Value, error)
Close
()
:
error
All occurrences
Please wait...
Page is in error, reload to recover