Syntax aware merging of diverging files

Overview

Mergiraf is a structured merge tool. It takes three versions of a file (base, left and right) and produces a fourth version where the changes from base to left and from base to right are added. It does so with awareness of the syntax of the files, unlike Git's built-in line-based merge algorithm.

It is primarily designed to be used as a CLI which implements Git merge driver. This means that it can replace Git's default merge algorithm when merging or rebasing branches.

Using as a library to build other programs

Mergiraf is not designed to be used as a library so far, the Rust API is therefore not meant to be stable.

Mergiraf

A syntax-aware git merge driver for a growing collection of programming languages and file formats.

See the documentation.

We welcome contributions and new team members, see CONTRIBUTING.md.

License: GPLv3