mhagger/git-imerge

Health v2 · maintenance only

Adoption not part of the score

2844 stars · 131 forks observed · 2026-08-28

What it is AI-extracted, prompt v1, taxonomy v1, 2026-08-30, confidence not recorded

git-imerge is a Python CLI tool that performs Git merges and rebases incrementally, commit by commit. It isolates the smallest possible pairwise conflicts and lets merges be interrupted, resumed, published, and collaborated on while in progress.

Use cases

• resolve a gnarly git merge conflict commit by commit
• rebase a long-lived branch with minimal conflict pain
• pause and resume an in-progress merge across days or machines
• find exactly which pairs of commits conflict between two branches
• push an unfinished merge so a teammate can finish resolving it
• visualize merge progress with a diagram

When to choose

• a big merge or rebase produces a large conflict blob that is hard to untangle
• you want to record merge progress as git refs and resume later
• you want each conflict reduced to the smallest possible pairwise conflict

When to avoid

• simple merges that resolve cleanly with plain git merge
• you need a GUI-based conflict resolution workflow
• you cannot install Python alongside a recent Git

Facets

cli-tool · maturity maintenance

version-control developer-tools cli version-control developer-tools cli cross-platform python git merge-conflicts incremental-merge rebase command-line

Member repositories

For agents

markdown · JSON · MCP: product_card(name="mhagger/git-imerge")