Start imerge-based merge (checkout the branch to merge into, first)
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>.