mergiraf
« Back to VersTracker
Description:
Syntax-aware git merge driver
Type: Formula  |  Tracked Since: Dec 28, 2025
Links: Homepage  |  formulae.brew.sh
Category: Developer tools
Tags: git merge ast developer-tools version-control
Install: brew install mergiraf
About:
Mergiraf is a syntax-aware git merge driver that resolves merge conflicts by understanding the structure of the source code. It parses the file content into an Abstract Syntax Tree (AST) and performs a three-way merge on the tree structure. This approach produces clean, conflict-free merges for supported languages, even when changes occur on the same lines.
Key Features:
  • Syntax-aware merging via AST parsing
  • Supports multiple programming languages (Java, Go, JSON, XML, etc.)
  • Integrates with Git as a native merge driver
  • Produces cleaner merges than line-based algorithms
Use Cases:
  • Resolving complex merge conflicts in structured files
  • Automating merges in CI/CD pipelines
  • Improving merge success rates in large, multi-language repositories
Alternatives:
  • git-imerge – Performs incremental merges but is still primarily line-based.
  • semantic-merge – Commercial tools offering similar AST-based capabilities for specific languages.
Version History
Detected Version Rev Change Commit
Sep 15, 2025 12:58am 0 VERSION_BUMP 7cfe4fb9
Nov 18, 2024 7:33pm 0 NEW dee2a696