4 ms·
I use mostly https://github.com/mhagger/git-imerge https://github.com/mhagger/git-imerge for complex merges. imerge + meld is wonderful...
by bitwave 9y ago
I use mostly https://github.com/mhagger/git-imerge https://github.com/mhagger/git-imerge for complex merges. imerge + meld is wonderful...