git-imerge
« Back to VersTracker
Description:
Incremental merge for git
Type: Formula  |  Tracked Since: Dec 28, 2025
Links: Homepage  |  formulae.brew.sh
Category: Developer tools
Tags: git merge version-control rebase development
Install: brew install git-imerge
About:
git-imerge performs a merge between two Git branches incrementally, at the level of individual commits. It finds the minimum set of commits that need to be merged to bridge the gap between the branches. This approach drastically reduces merge conflicts and allows you to complete complex merges that might otherwise be too difficult.
Key Features:
  • Incremental merge process at the commit level
  • Automated conflict detection and resolution assistance
  • Preserves exact commit history from both branches
  • Works with any Git branch, not just feature branches
Use Cases:
  • Merging long-running feature branches with divergent histories
  • Rebasing complex branches without losing work
  • Finding the exact point where merge conflicts were introduced
Alternatives:
  • git-merge – Standard Git merge handles conflicts all at once, while git-imerge breaks them down incrementally
  • git-rebase – Rebase rewrites history; git-imerge preserves it while maintaining a linear progression
Version History
Detected Version Rev Change Commit
Sep 13, 2024 11:28am 1 VERSION_BUMP 5120d205