Versions in this module Expand all Collapse all v1 v1.1.0 Dec 26, 2025 v1.0.0 Dec 26, 2025 Changes in this version + type ConflictFile struct + Markers string + OursContent string + Path string + TheirsContent string + type Manager struct + func NewManager(baseDir, repoPath, baseBranch string) (*Manager, error) + func (m *Manager) AbortMerge() error + func (m *Manager) BaseBranch() string + func (m *Manager) BaseDir() string + func (m *Manager) BaseRepo() string + func (m *Manager) BranchCount() int + func (m *Manager) CleanupAll() error + func (m *Manager) CleanupBranch(branchID string) error + func (m *Manager) ContinueMerge(message string) error + func (m *Manager) CreateBranchWorktree(branchID, gitBranch string) (string, error) + func (m *Manager) GetWorktreePath(branchID string) string + func (m *Manager) GitContextForBranch(branchID string) (*git.Context, error) + func (m *Manager) ListBranchWorktrees() map[string]string + func (m *Manager) MergeBranches(ctx context.Context, cfg MergeConfig) ([]MergeResult, error) + func (m *Manager) MergeSingleBranch(ctx context.Context, branchID string, cfg MergeConfig) *MergeResult + func (m *Manager) ResolveConflict(path, resolvedContent string) error + type MergeConfig struct + CommitMessage string + NoFastForward bool + SquashMerge bool + type MergeResult struct + BranchID string + CommitSHA string + Conflicts []ConflictFile + Error error + Success bool
Go to main page