# mhagger/git-imerge

Incremental merge for git

Repository: https://github.com/mhagger/git-imerge
Canonical: https://ross.abutalabs.com/products/git-imerge
Language: Python
License: GPL-2.0
License Family: copyleft
Topics: git, python, merge-conflicts
Last push: 2024-07-17T00:05:59+00:00

## Health v2 (maintenance only)
Score: 23/100 (v2, computed 2026-09-03T02:20:16.233290+00:00)
- activity 0, release rhythm 8, longevity 100
- inputs: {"age_days": 4872, "days_push": 778, "days_rel": null, "gap_med": null, "n_releases_24m": 0}
- flags: none
- formula: round(0.45*activity + 0.35*rhythm + 0.20*longevity); archived -> min(score, 10)

## Adoption (not part of the score)
Stars 2844, forks 131 (observed 2026-08-28T04:07:24.887206+00:00)

## What it is
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
- artifact type: cli-tool
- maturity: maintenance
- function: version-control, developer-tools, cli
- domain: version-control, developer-tools
- platform: cli, cross-platform, python
- tags: git, merge-conflicts, incremental-merge, rebase, command-line

## Member repositories
- mhagger/git-imerge (main) score 23

## Provenance
- Observed fields: from GitHub, fetched 2026-08-28T04:07:24.887206+00:00.
- Health v2: computed from the inputs above; adoption is never an input.
- Inferred fields (summary, facets, guidance): AI-extracted, prompt v1, taxonomy v1, on 2026-08-30T07:37:10.234951+00:00, confidence not recorded.
  - readme: https://github.com/mhagger/git-imerge (fetched 2026-08-28T04:07:24.887206+00:00, sha a1ac646a3e6f)
  - registry_pypi: https://pypi.org/pypi/git-imerge/json (fetched 2026-08-29T09:52:39.918314+00:00, sha e91812a371e0)
- Data as of 2026-08-30T08:39:29.467469+00:00.