merge

package

v0.4.4 Latest Latest Go to latest Published: Jun 6, 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/provasign/fuse

Links

Open Source Insights

Documentation ¶

Overview ¶

Package merge orchestrates the 7-phase IntelliMerge pipeline.

Index ¶

type IntelliMerge
- func New(g analysis.GroveLike) *IntelliMerge
- func (im *IntelliMerge) Merge(ctx context.Context, baseContent, oursContent, theirsContent []byte, ...) (*core.MergeResult, error)

Constants ¶

This section is empty.

Variables ¶

This section is empty.

Functions ¶

This section is empty.

Types ¶

type IntelliMerge ¶

type IntelliMerge struct {
	Parser           *parser.Engine
	Registry         *languages.Registry
	Grove            analysis.GroveLike
	HandoffThreshold float64 // confidence below which we emit a handoff prompt
	EnableBreaking   bool
	EnableContext    bool
	BreakingAnalyzer *analysis.BreakingChangeAnalyzer
}

IntelliMerge orchestrates parsing, classification, merging, and diagnostics for a single-file merge.

func New ¶

func New(g analysis.GroveLike) *IntelliMerge

New returns an IntelliMerge using default registry + thresholds.

func (*IntelliMerge) Merge ¶

func (im *IntelliMerge) Merge(
	ctx context.Context,
	baseContent, oursContent, theirsContent []byte,
	lang core.LanguageKey,
	filePath string,
) (*core.MergeResult, error)

Merge runs the 7-phase pipeline and returns a MergeResult.

Context (Grove deps + dependents)
Symbol extraction (parse base, ours, theirs)
Recency analysis (placeholder; uses symbol-level signals only — no git log)
Project graph context (Grove blast radius)
Breaking change detection
Classification + strategy selection + merge application
Diagnostics + handoff prompt emission (caller handles file IO)

For config files (JSON/YAML/TOML), phases 2/4/5/6 collapse to a single structural deep-merge.

Source Files ¶

View all Source files

orchestrator.go

Directories ¶

Path	Synopsis
analysis Package analysis covers breaking change detection, blast radius lookup, and risk scoring during the merge pipeline.	Package analysis covers breaking change detection, blast radius lookup, and risk scoring during the merge pipeline.
classification Package classification categorizes a merge conflict by type and severity.	Package classification categorizes a merge conflict by type and severity.
strategies Package strategies implements three-way merge algorithms.	Package strategies implements three-way merge algorithms.

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