Git Merge • git-imerge (Michael Haggerty)
Channel: GitHub
Date: 05/06/2013

Subscribe: http://bit.ly/subgithub • Michael Haggerty describes his git-imerge tool in detail, which performs merges between git branches incrementally. If conflicts are encountered, the tool figures out exactly which pairs of commits conflict, and presents the user with one pairwise conflict at a time for resolution.

About Git Merge
Git Merge is a Git user conference, held to bring together Git users and Git developers. This May, they came together in Berlin to improve the world of Git for everyone.