git-imerge

{
  "aliases": [],
  "alternatives": [],
  "build_dependencies": [],
  "categories": [],
  "caveats": null,
  "conflicts_with": [],
  "dependencies": [
    "python@3.14"
  ],
  "deprecated": 0,
  "deprecation_reason": null,
  "desc": "Incremental merge for git",
  "disable_reason": null,
  "disabled": 0,
  "enrichment_fetched_at": "2026-06-20T23:38:04+00:00",
  "first_seen": "2026-06-20T23:34:18+00:00",
  "full_name": "git-imerge",
  "github_default_branch": "master",
  "github_last_commit_at": "2024-07-17T00:05:59Z",
  "github_readme_excerpt": "# git-imerge -- incremental merge and rebase for Git\n\nPerform a merge between two branches incrementally. If conflicts are encountered, figure out exactly which pairs of commits conflict, and present the user with one pairwise conflict at a time for resolution.\n\n`git-imerge` has two primary design goals:\n\n* Reduce the pain of resolving merge conflicts to its unavoidable minimum, by finding and presenting the smallest possible conflicts: those between the changes introduced by one commit from each branch.\n\n* Allow a merge to be saved, tested, interrupted, published, and collaborated on while it is in progress.\n\nI think that it is easiest to understand the concept of incremental merging visually, and therefore I recommend the video of my [git-imerge presentation from the GitMerge 2013 conference](https://www.youtube.com/watch?v=FMZ2_-Ny_zc) (20 min) as a good place to start. The full slides for that talk are available in this repository under `doc/presentations/GitMerge-2013`. At the same conference, I was interviewed about `git-imerge` by Thomas Ferris Nicolaisen for his [GitMinutes Podcast #12](https://episodes.gitminutes.com/2013/06/gitminutes-12-git-merge-2013-part-4.html).\n\nTo learn how to use the `git-imerge` tool itself, I suggest the blog article [git-imerge: A Practical Introduction](https://softwareswirl.blogspot.com/2013/05/git-imerge-practical-introduction.html) and also typing `git-imerge --help` and `git-imerge SUBCOMMAND --help`. If you want more information, the theory and benefits of incremental merging are described in minute detail in a series of blog articles [[1](#REF1)], as are the benefits of retaining history when doing a rebase [[2](#REF2)].\n\nMultiple incremental merges can be in progress at the same time. Each incremental merge has a name, and its progress is recorded in the Git repository as references under `refs/imerge/NAME`. The current state of an incremental merge can be visualized using the `diagram` command.\n\nAn incremental merge can ",
  "github_repo": "mhagger/git-imerge",
  "github_stars": 2825,
  "github_topics": [
    "git",
    "merge-conflicts",
    "python"
  ],
  "homepage": "https://github.com/mhagger/git-imerge",
  "homepage_og_description": null,
  "homepage_og_image": null,
  "homepage_title": null,
  "installs_30d": 33,
  "installs_365d": 198,
  "installs_90d": 67,
  "keg_only": 0,
  "keg_only_reason": null,
  "last_seen": "2026-06-20T23:34:18+00:00",
  "license": "GPL-2.0-or-later",
  "llm_generated_at": null,
  "llm_model": null,
  "name": "git-imerge",
  "oldnames": [],
  "one_liner": null,
  "optional_dependencies": [],
  "rank_30d": 5575,
  "rank_365d": 7390,
  "rank_90d": 6575,
  "raw_hash": "61fe2e0f07e2b978",
  "recommended_dependencies": [],
  "revision": 1,
  "ruby_source_path": "Formula/g/git-imerge.rb",
  "tap": "homebrew/core",
  "test_dependencies": [],
  "uses_from_macos": [],
  "version_head": "HEAD",
  "version_stable": "1.2.0",
  "versioned_formulae": [],
  "why_use_this": null
}