git-imerge

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.

Start an incremental merge (shorthand for start --goal merge).

Start an incremental rebase (shorthand for start --goal rebase).

Continue resolving conflicts.

Complete the incremental merge.

Abort and remove incremental merge state.

Show visual merge status grid.

List all in-progress incremental merges.

Attempt to fill in all merge blocks automatically.

Simplify the merge history after finishing.

Initialize an imerge from existing merge state.

Record the result of a merge done manually.

Drop a commit from the merge.

Revert a commit in the merge.

Name for the incremental merge.

Merge goal: merge, rebase, rebase-with-history, border, border-with-history.

Handle first-parent history only.

Force start even if one is already in progress.

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)