git-imerge

Start incremental merge

$ git imerge start --name=[merge-name] [branch]

$ git imerge continue

$ git imerge diagram

$ git imerge finish

$ git imerge remove

git imerge command [options]

git imerge performs incremental, bisect-style merges. Instead of one large merge with many conflicts, it merges commits one at a time, making conflict resolution more manageable and helping identify exactly which commits cause conflicts.
The tool tracks merge progress visually via the diagram command and allows conflicts to be resolved independently. This approach is particularly valuable for difficult merges between long-diverged branches.

start

Begin incremental merge.

Continue resolving conflicts.

Complete merge.

Abort incremental merge.

Show visual merge status.

Merge branch name.

Merge goal (merge, rebase, etc.).

Display help information.

Separate installation required. More complex than simple merge. Best for difficult merges.

git imerge was created by Michael Haggerty to address the pain of large, conflict-heavy merges by breaking them into smaller pieces.

git-merge(1), git-rebase(1)