From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alex Riesen Subject: Re: [PATCH 00/12] Towards a better merge resolution support Date: Mon, 1 Sep 2008 11:39:24 +0200 Message-ID: <20080901093924.GA3993@blimp.local> References: <1220056963-2352-1-git-send-email-gitster@pobox.com> Reply-To: Alex Riesen Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: git@vger.kernel.org To: Junio C Hamano X-From: git-owner@vger.kernel.org Mon Sep 01 11:40:43 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 1Ka5tl-0007Ov-JN for gcvg-git-2@gmane.org; Mon, 01 Sep 2008 11:40:38 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753122AbYIAJj2 (ORCPT ); Mon, 1 Sep 2008 05:39:28 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753197AbYIAJj2 (ORCPT ); Mon, 1 Sep 2008 05:39:28 -0400 Received: from mo-p05-ob.rzone.de ([81.169.146.180]:43756 "EHLO mo-p05-ob.rzone.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753076AbYIAJj1 (ORCPT ); Mon, 1 Sep 2008 05:39:27 -0400 X-RZG-CLASS-ID: mo05 X-RZG-AUTH: :YSxENQjhO8RswxTRIGdg20lf4ka7 Received: from tigra.home (Fab22.f.strato-dslnet.de [195.4.171.34]) by post.webmailer.de (klopstock mo7) (RZmta 16.47) with ESMTP id 6016d6k818AG9V ; Mon, 1 Sep 2008 11:39:24 +0200 (MEST) (envelope-from: ) Received: from blimp (unknown [192.168.0.8]) by tigra.home (Postfix) with ESMTP id 69DD2277AE; Mon, 1 Sep 2008 11:39:24 +0200 (CEST) Received: by blimp (Postfix, from userid 1000) id 44DE536D1D; Mon, 1 Sep 2008 11:39:24 +0200 (CEST) Content-Disposition: inline In-Reply-To: <1220056963-2352-1-git-send-email-gitster@pobox.com> User-Agent: Mutt/1.5.17+20080114 (2008-01-14) Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Junio C Hamano, Sat, Aug 30, 2008 02:42:31 +0200: > The early part of the series is what you already saw. In addition to > recording a conflicted merge in the RCS merge style we have traditionally > used, this allows you to optionally use "diff3 -m" style. The difference > is that the latter format shows the part from the common ancestor that > corresponds to the parts both sides modified to cause the conflict, in > addition to the changes done on each side. This can be chosen by setting > a configuration variable. Rerere mechanism is updated to understand this > new format as well, and conflicts from either formats interoperate well, > because rerere mechanism only records and uses the changes made on each > side, not what was in the common ancestor. > > The last four patches are to "git checkout" that checks things out of the > index. ... I like that and started using the patches. Do you have any specific area I should pay a special attention to?