conflict

Documentation

Index

• func Solve(in io.Reader, out io.Writer, filePath string, fileA, fileB []byte) ([]byte, error)
• type Model
  • func NewModel(filePath string, fileA, fileB []byte) Model
  • func (m Model) Init() tea.Cmd
  • func (m Model) Result() []byte
  • func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd)
  • func (m Model) View() string

Functions

func Solve

func Solve(in io.Reader, out io.Writer, filePath string, fileA, fileB []byte) ([]byte, error)

Types

type Model

type Model struct {
	// contains filtered or unexported fields
}

func NewModel

func NewModel(filePath string, fileA, fileB []byte) Model

func (Model) Init

func (m Model) Init() tea.Cmd

func (Model) Result

func (m Model) Result() []byte

func (Model) Update

func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd)

func (Model) View

func (m Model) View() string

TODO: Make merge conflict solving more advanced instead of just file override confirmation