npm

git-imerge

Incremental merge tool for git that simplifies complex merge conflicts

brewmacoslinux
Try with needOr install directly
Source

About

Incremental merge for git

Commands

git-imerge

Examples

Start an incremental merge of a branch into current branch$ git imerge start origin/feature-branch
Continue an interrupted incremental merge by auto-resolving simple conflicts$ git imerge continue
Finish the incremental merge and create the final merge commit$ git imerge finish