3 ms·Dealing with Diverged Git Branches4 points by hasheddan 3y agotsukikage 3y agoSee also: https://github.com/mhagger/git-imerge https://github.com/mhagger/git-imerge