resolve

Jul 16, 2024

Changes in this version

+ type NoopResolver struct

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

Jul 4, 2024

Changes in this version

+ const AbortFileName

+ const ShellWelcomeMessage

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

+ type Aborter struct

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

+ type Blind struct

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

+ type MergeResolver struct

+ Strategy ResolveStrategy

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

+ type ResolveStrategy int

+ const StrategyOurs

+ const StrategyTheirs

+ type Resolver interface

+ Resolve func(*git.Worktree) error

+ type Shell struct

+ Logger *slog.Logger

+ Package *charts.Package

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