How git-mediate made me stop fearing merge conflicts and start treating them like an easy game of…
Yair Chuchem

If you want to split large merge into smaller ones, instead of using <tt>git rebase</tt> (which has its own problems, and results in different shape of history than using merge), you can use third-party tool <tt>git-imerge</tt>.

Like what you read? Give Jakub Narębski a round of applause.

From a quick cheer to a standing ovation, clap to show how much you enjoyed this story.