conflicts

package

v0.0.4 Latest Latest Go to latest Published: Mar 23, 2026 License: MIT Imports: 11 Imported by: 0

Details

Valid go.mod file
Redistributable license
Tagged version
Stable version
Learn more about best practices

Repository

github.com/jongio/grut

Links

Open Source Insights

Documentation ¶

Overview ¶

Package conflicts implements the conflict resolution panel for grut. It displays files with merge/rebase conflicts and provides actions to mark files as resolved (by staging), continue the merge/rebase, or abort.

Constants ¶

This section is empty.

Variables ¶

This section is empty.

Functions ¶

This section is empty.

Types ¶

type Panel ¶

type Panel struct {
	panels.BasePanel
	// contains filtered or unexported fields
}

--------------------------------------------------------------------------- Panel --------------------------------------------------------------------------- Panel is the conflict resolution panel. It lists conflicted files and provides resolve, continue, and abort actions.

func New ¶

func New(gc gitOps) *Panel

New creates a new conflicts panel with the given git client.

func (*Panel) Init ¶

func (p *Panel) Init(ctx context.Context) tea.Cmd

Init implements panels.Panel.

func (*Panel) KeyBindings ¶

func (p *Panel) KeyBindings() []panels.KeyBinding

KeyBindings implements panels.Panel.

func (*Panel) SetActionsCfg ¶

func (p *Panel) SetActionsCfg(cfg config.ActionsConfig)

SetActionsCfg stores the actions configuration for right-click menus.

func (*Panel) Update ¶

func (p *Panel) Update(msg tea.Msg) (panels.Panel, tea.Cmd)

--------------------------------------------------------------------------- Update --------------------------------------------------------------------------- Update implements panels.Panel.

func (*Panel) View ¶

func (p *Panel) View(width, height int) string

--------------------------------------------------------------------------- View --------------------------------------------------------------------------- View implements panels.Panel.

Source Files ¶

View all Source files

conflicts.go

?	: This menu
/	: Search site
f or F	: Jump to
y or Y	: Canonical URL