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
/
stash.go
Search
History
183 lines
|
ISO-8859-1
|
4 KB
Blame
Outline
2
4
8
No wrap
Soft wrap
Outline
conflictStash
Stash
:
map[string]*conflictData
conflictData
HasConflicts
:
bool
Sch
:
conflict.ConflictSchema
ConfIdx
:
durable.ConflictIndex
violationStash
Stash
:
map[string]types.Map
stashConflicts
(ctx context.Context, root *doltdb.RootValue)
:
(*doltdb.RootValue, *conflictStash, error)
stashViolations
(ctx context.Context, root *doltdb.RootValue)
:
(*doltdb.RootValue, *violationStash, error)
applyConflictStash
(ctx context.Context, stash map[string]*conflictData, root *doltdb.RootValue)
:
(*doltdb.RootValue, error)
getConflictData
(ctx context.Context, tbl *doltdb.Table)
:
(*conflictData, error)
setConflictData
(ctx context.Context, tbl *doltdb.Table, data *conflictData)
:
(*doltdb.Table, error)
*conflictStash
Empty
()
:
bool
*violationStash
Empty
()
:
bool
All occurrences
Please wait...
Page is in error, reload to recover