gitconflict

package

v0.0.12 Latest Latest Go to latest Published: Aug 10, 2026 License: MIT Imports: 8 Imported by: 0

Details

This section is empty.

This section is empty.

func HasConflicts(ctx context.Context, repoRoot string) bool

HasConflicts reports whether the repo has unmerged paths.

func ListFiles(ctx context.Context, repoRoot string) ([]string, error)

ListFiles returns unmerged file paths in the repository.

type File struct {
	Path   string
	Module string
	Reason string
}

File describes one conflicted path.

type Snapshot struct {
	Files   []File
	Groups  map[string][]string
	Summary string
}

Snapshot is a structured conflict report.

func BuildSnapshot(ctx context.Context, repoRoot string) (Snapshot, error)

BuildSnapshot creates a grouped conflict report.

func BuildSnapshotWithAI(ctx context.Context, repoRoot string, provider aiprovider.Provider, useAI bool) (Snapshot, error)

BuildSnapshotWithAI builds a snapshot and optionally enhances it with AI reasons.

func EnhanceSnapshot(ctx context.Context, snap Snapshot, provider aiprovider.Provider, repoRoot string) (Snapshot, error)

EnhanceSnapshot optionally replaces heuristic reasons with AI analysis.