git-imerge
incremental merge and rebase for git
Description
Performs a merge between two branches incrementally. If conflicts are encountered, figures out exactly which pairs of commits conflict, and presents the user with one pairwise conflict at a time for resolution.Upload more screenshots
Please help extend the collection of screenshots. Just make a screenshot and upload it here. You don't need to register or anything.
Upload a screenshotHint: upload an image here from your clipboard with Ctrl-V
Homepage
https://github.com/mhagger/git-imerge
Install this software package
If the package is available for the distribution you are currently using on your computer then install the software by clicking on…
Install git-imerge