to_merge

Documentation

Index

• type ErrMergeConflict
  • func MakeErrMergeConflict(sk *sku.ExternalFDs) (err *ErrMergeConflict)
  • func (e *ErrMergeConflict) Error() string
  • func (e *ErrMergeConflict) Is(target error) bool
• type Sku
  • func (tm Sku) IsAllInlineTyp(itc kennung.InlineTypChecker) bool
  • func (tm *Sku) MergeEtiketten() (err error)
  • func (tm *Sku) ReadConflictMarker(sv schnittstellen.StoreVersion, op objekte_format.Options) (err error)
  • func (tm Sku) WriteConflictMarker(s standort.Standort, sv schnittstellen.StoreVersion, op objekte_format.Options, ...) (err error)

Types

type ErrMergeConflict

type ErrMergeConflict struct {
	sku.ExternalFDs
}

func MakeErrMergeConflict

func MakeErrMergeConflict(sk *sku.ExternalFDs) (err *ErrMergeConflict)

func (*ErrMergeConflict) Error

func (e *ErrMergeConflict) Error() string

func (*ErrMergeConflict) Is

func (e *ErrMergeConflict) Is(target error) bool

type Sku

type Sku struct {
	ConflictMarkerPath  string
	Left, Middle, Right *sku.Transacted
}

func (Sku) IsAllInlineTyp

func (tm Sku) IsAllInlineTyp(itc kennung.InlineTypChecker) bool

func (*Sku) MergeEtiketten

func (tm *Sku) MergeEtiketten() (err error)

func (*Sku) ReadConflictMarker

func (tm *Sku) ReadConflictMarker(
	sv schnittstellen.StoreVersion,
	op objekte_format.Options,
) (err error)

func (Sku) WriteConflictMarker

func (tm Sku) WriteConflictMarker(
	s standort.Standort,
	sv schnittstellen.StoreVersion,
	op objekte_format.Options,
	path string,
) (err error)