From: Junio C Hamano Date: Thu, 08 Sep 2005 22:00:04 GMT Subject: Re: Multi-ancestor read-tree notes Message-ID: <7vy867te3f.fsf@assigned-by-dhcp.cox.net> In-Reply-To: Daniel Barkalow writes: > I assume that what you want is something to include everything from two > commits, which would give conflicts if a name is reused? My understanding is that Darrin wants to do what Linus did when he merged gitk into git.git. Personally I think that is a specialized application and something like the git-merge-projects script I posted as a follow-up would be more appropriate than adding it to the current merge discussion.