The Mergiraf 0.4 project release has been published, introducing a driver for Git to implement three-way merging. Mergiraf supports resolving various types of merge conflicts and can be used with different programming languages and file formats. It can be invoked independently to handle conflicts that arise with standard Git or replace Git's default merge handler to enhance commands such as merge, revert, rebase, and cherry-pick. The code is distributed under the GPLv3 license. The new version a...

View Entire Post