Documentationv1.4.0
merge
Run smart merge on current conflicted files using precision AST heuristics.
mergeThe merge command processes files containing Git merge conflict markers. It parses the blocks, runs language-specific AST validation, checks policy boundaries, and auto-applies safe resolutions. Complex conflicts are safely escalated for manual inspection.
bash
$gitresolve merge
Engine Bootup: Initializing gitresolve in directory '.'
Scanning index. Found 2 unmerged conflicts...
--- Processing main.go ---
✓ Resolution applied automatically to main.go.
Merge complete. auto_resolved: 2, manual_escalations: 0.
Command Options
--dry-runShow what resolutions would be applied without modifying any files.
--shadowSimulate resolutions and record decisions without writing to the disk.
--policy-profile <name>The security policy profile: auto, strict, balanced, or aggressive.
--no-auto-structuredDisable auto-resolution for structured files (JSON/YAML/TOML).
--enforce-gatesEnforce release gate thresholds (manual rate and validation failures).
--manual-rate-gate <%>Maximum allowed manual escalation rate (default: 60%).