From mboxrd@z Thu Jan 1 00:00:00 1970 From: Nanako Shiraishi Subject: Re: more merge strategies : feature request Date: Thu, 04 Dec 2008 19:11:07 +0900 Message-ID: <20081204191107.6117@nanako3.lavabit.com> References: <7vabbc7kk5.fsf@gitster.siamese.dyndns.org> <81bfc67a0811290848m6cb219c0y71a7266001096f2d@mail.gmail.com> <4933AC03.6050300@op5.se> <81bfc67a0812020546o79906a20jcd04bd42d18dd803@mail.gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: "Leo Razoumov" , "Caleb Cushing" , git@vger.kernel.org To: Junio C Hamano X-From: git-owner@vger.kernel.org Thu Dec 04 11:13:17 2008 Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1L8BCl-0007lp-39 for gcvg-git-2@gmane.org; Thu, 04 Dec 2008 11:13:07 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753795AbYLDKLt (ORCPT ); Thu, 4 Dec 2008 05:11:49 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754338AbYLDKLt (ORCPT ); Thu, 4 Dec 2008 05:11:49 -0500 Received: from karen.lavabit.com ([72.249.41.33]:42114 "EHLO karen.lavabit.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751708AbYLDKLs (ORCPT ); Thu, 4 Dec 2008 05:11:48 -0500 Received: from b.earth.lavabit.com (b.earth.lavabit.com [192.168.111.11]) by karen.lavabit.com (Postfix) with ESMTP id 1FCCBC86A7; Thu, 4 Dec 2008 04:11:47 -0600 (CST) Received: from 4746.lavabit.com (212.62.97.21) by lavabit.com with ESMTP id 97T8K4QR6W3M; Thu, 04 Dec 2008 04:11:47 -0600 DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=lavabit; d=lavabit.com; b=LBcJi/dACSdVF6/aF9XxWv212EKj2th2OGc9r3Mkxg65z45tM5cSxVW9ePPcwNAW4UAlZfi2prxd6Ao2ufIOzdmVPPwxo+T0Pyqqjdq0mQVSvEM1HefObtMfX9ZazKAJlmkbSop4RTrwnMPMhB8/5sMkT3tmhbfH3+8jIBow88E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:MIME-Version:Content-Type:Content-Transfer-Encoding:Message-Id; In-Reply-To: <7vabbc7kk5.fsf@gitster.siamese.dyndns.org> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Quoting Junio C Hamano : > I thought http://article.gmane.org/gmane.comp.version-control.git/89033 in > the thread (and your response to it which is 89175) pretty much concluded > the discussion. Is Caleb adding anything new to the discussion (iow, is > there a convincing new argument why having such a merge is a good idea and > what the workflow looks like that benefits from it)? I first thought so, but after reading this feature request thread again I do not think so anymore. Sorry for the noise. -- Nanako Shiraishi http://ivory.ap.teacup.com/nanako3/