Guix

This Git extension defines a subcommand, imerge, which performs an incremental merge between two branches. Its two primary design goals are to reduce the pain of resolving merge conflicts by finding the smallest possible conflicts and to allow a merge to be saved, tested, interrupted, published, and collaborated on while in progress.