From mboxrd@z Thu Jan 1 00:00:00 1970 From: Fabian Franz Subject: Re: Merge with git-pasky II. Date: Tue, 26 Apr 2005 23:36:27 +0200 Message-ID: <200504262336.02583.FabianFranz@gmx.de> References: Mime-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Cc: git@vger.kernel.org, Linus Torvalds X-From: git-owner@vger.kernel.org Tue Apr 26 23:36:41 2005 Return-path: Received: from vger.kernel.org ([12.107.209.244]) by ciao.gmane.org with esmtp (Exim 4.43) id 1DQXiK-0004WC-Sp for gcvg-git@gmane.org; Tue, 26 Apr 2005 23:35:29 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S261802AbVDZVke (ORCPT ); Tue, 26 Apr 2005 17:40:34 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S261803AbVDZVke (ORCPT ); Tue, 26 Apr 2005 17:40:34 -0400 Received: from imap.gmx.net ([213.165.64.20]:53655 "HELO mail.gmx.net") by vger.kernel.org with SMTP id S261802AbVDZVk0 (ORCPT ); Tue, 26 Apr 2005 17:40:26 -0400 Received: (qmail invoked by alias); 26 Apr 2005 21:40:24 -0000 Received: from p54A3DA92.dip.t-dialin.net (EHLO ff.cornils.net) [84.163.218.146] by mail.gmx.net (mp002) with SMTP; 26 Apr 2005 23:40:24 +0200 X-Authenticated: #590723 To: Bram Cohen User-Agent: KMail/1.5.4 In-Reply-To: Content-Description: clearsigned data Content-Disposition: inline X-Y-GMX-Trusted: 0 Sender: git-owner@vger.kernel.org Precedence: bulk X-Mailing-List: git@vger.kernel.org -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 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? This would resolve all your problems. I think the "magic-merge" command is quite exchangable and if your way works good and is compatible, then people will automatically start using that. cu Fabian -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.4 (GNU/Linux) iD8DBQFCbrRdI0lSH7CXz7MRAkS4AJ9JEka71M0Zc6cizXhrYpHiKHhL0gCcD/3Q j+UnPU/cXafGjGG6Bt9mZE8= =IYk0 -----END PGP SIGNATURE-----