From: Linus Torvalds <torvalds@osdl.org>
Date: Tue, 26 Apr 2005 22:30:06 GMT
Subject: Re: Merge with git-pasky II.
Message-ID: <Pine.LNX.4.58.0504261528110.18901@ppc970.osdl.org>
In-Reply-To: <200504262336.02583.FabianFranz@gmx.de>



On Tue, 26 Apr 2005, Fabian Franz wrote:
> 
> Am Dienstag, 26. April 2005 23:28 schrieb Bram Cohen:
> > Now you've just gone off the deep end. This is an apples-to-apples
> > comparison. Please accept one of thee following two statements:
> >
> > (a) Git doesn't do merging, and none of the related new tools around it do
> > merging.
> >
> > (b) Codeville merge (sans rename functionality) would be superior for the
> > merging which will be done.
> 
> I have one very humble question:
> 
> Why don't you write and contribute some code for git to do good merging?

Don't bother. Bram doesn't know what he's talking about. 

		Linus