resolve

Documentation

Index

• Constants
• Variables
• type Aborter
  • func (a Aborter) Resolve(*git.Worktree) error
• type Blind
  • func (b Blind) Resolve(wt *git.Worktree) error
• type MergeResolver
  • func (m MergeResolver) Resolve(wt *git.Worktree) error
• type NoopResolver
  • func (n NoopResolver) Resolve(*git.Worktree) error
• type ResolveStrategy
• type Resolver
• type Shell
  • func (s *Shell) Resolve(wt *git.Worktree) error

Constants

const (
	ShellWelcomeMessage = `` /* 355-byte string literal not displayed */

	AbortFileName = ".abort_rebase"
)

Variables

var (
	ErrAbort = fmt.Errorf("rebase aborted by user")
)

Types

type Aborter

type Aborter struct{}

Aborter immediately aborts the rebase.

func (Aborter) Resolve

func (a Aborter) Resolve(*git.Worktree) error

type Blind

type Blind struct{}

Blind behaves as if there are no conflicts and simply stages the changes files without doing anything.

func (Blind) Resolve

func (b Blind) Resolve(wt *git.Worktree) error

type MergeResolver

type MergeResolver struct {
	Strategy ResolveStrategy
}

func (MergeResolver) Resolve

func (m MergeResolver) Resolve(wt *git.Worktree) error

type NoopResolver

type NoopResolver struct{}

func (NoopResolver) Resolve

func (n NoopResolver) Resolve(*git.Worktree) error

type ResolveStrategy

type ResolveStrategy int

const (
	StrategyOurs ResolveStrategy = iota
	StrategyTheirs
)

type Resolver

type Resolver interface {
	Resolve(*git.Worktree) error
}

Resolver defines how to handle conflicts between the stating and quarantine brnanches, and stages the conflicting files in git once resolved.

type Shell

type Shell struct {
	Logger  *slog.Logger
	Package *charts.Package
}

func (*Shell) Resolve

func (s *Shell) Resolve(wt *git.Worktree) error