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
/
sqle
/
dprocedures
/
dolt_conflicts_resolve.go
Search
History
453 lines
|
ISO-8859-1
|
11 KB
Blame
Outline
2
4
8
No wrap
Soft wrap
Outline
ErrConfSchIncompatible
doltConflictsResolve
(ctx *sql.Context, args ...string)
:
(sql.RowIter, error)
DoltConflictsCatFunc
children
:
[]sql.Expression
getProllyRowMaps
(ctx *sql.Context, vrw types.ValueReadWriter, ns tree.NodeStore, hash hash.Hash, tblName string)
:
(prolly.Map, error)
resolveProllyConflicts
(ctx *sql.Context, tbl *doltdb.Table, tblName string, sch schema.Schema)
:
(*doltdb.Table, error)
resolvePkConflicts
(ctx *sql.Context, opts editor.Options, tbl *doltdb.Table, tblName string, sch schema.Schema, conflicts types.Map)
:
(*doltdb.Table, error)
resolveKeylessConflicts
(ctx *sql.Context, tbl *doltdb.Table, conflicts types.Map)
:
(*doltdb.Table, error)
resolveNomsConflicts
(ctx *sql.Context, opts editor.Options, tbl *doltdb.Table, tblName string, sch schema.Schema)
:
(*doltdb.Table, error)
validateConstraintViolations
(ctx *sql.Context, before, after *doltdb.RootValue, table string)
:
error
clearTableAndUpdateRoot
(ctx *sql.Context, root *doltdb.RootValue, tbl *doltdb.Table, tblName string)
:
(*doltdb.RootValue, error)
ResolveConflicts
(ctx *sql.Context, dSess *dsess.DoltSession, root *doltdb.RootValue, dbName string, ours bool, tblNames []string)
:
error
DoDoltConflictsResolve
(ctx *sql.Context, args []string)
:
(int, error)
All occurrences
Please wait...
Page is in error, reload to recover