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.