mergiraf — an AST-oriented tool for three-way merging in Git
The release of the mergiraf 0.4 project has been announced, which develops a Git driver with three-way merging capabilities. Mergiraf supports the resolution of various kinds of conflicts during merging and can be used for different programming languages and file formats. It is possible to call mergiraf separately to handle conflicts that arise when working with standard Git, as well as replacing the merge handler in Git to extend […]
