Documentation
¶
Index ¶
Constants ¶
This section is empty.
Variables ¶
View Source
var ( ErrInteractiveRequired = errors.New("interactive input required") ErrConflictRefused = errors.New("conflict policy refused to apply incoming data") ErrMergeBaseMissing = errors.New("three-way merge requires a base revision") ErrUnknownAncestry = errors.New("three-way merge base revision is unknown locally") ErrMergeConflict = errors.New("three-way merge produced unresolved conflicts") )
Functions ¶
This section is empty.
Types ¶
type ConflictResolution ¶
type ConflictResolution struct {
Key string
Action ConflictResolutionAction
Value string
}
type ConflictResolutionAction ¶
type ConflictResolutionAction string
const ( ConflictUseLocal ConflictResolutionAction = "use-local" ConflictUseRemote ConflictResolutionAction = "use-remote" ConflictUseCustom ConflictResolutionAction = "use-custom" ConflictKeepAbsent ConflictResolutionAction = "keep-absent" )
type Options ¶
type Options struct {
ProjectID string
TargetFile string
IncomingFile string
IncomingData []byte
BaseRevisionID string
AncestorRevisionIDs []string
NewRevisionID string
Policy Policy
Interactive bool
BackupEnabled bool
BackupKey [32]byte
MaxVersions int
OnDiff func(diff *envfile.DiffResult)
ConfirmApply func(diff *envfile.DiffResult) bool
ResolveConflicts func(conflicts []envfile.Conflict) ([]ConflictResolution, bool)
}
Click to show internal directories.
Click to hide internal directories.