Reduce False Git Conflicts When Separate Functions In One File Change

A Rust Git merge driver that parses code into entities such as functions, classes, and keys, then performs three-way semantic merges. It can resolve independent edits that line-based Git reports as conflicts and provides an MCP server for agent integration.

AI Coding | Rust · coding-agents · git-merge