git-imerge

Perform a merge or rebase between two Git branches incrementally. Conflicts between branches are tracked down to pairs of individual commits, to simplify conflict resolution. More information: https://github.com/mhagger/git-imerge.

git imerge rebase branch_to_rebase_onto

git imerge merge branch_to_be_merged

git imerge diagram

git imerge continue --no-edit

git imerge finish

git-imerge remove && git checkout previous_branch