From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mihamina Rakotomandimby Subject: Re: More Beginning Git Questions Date: Fri, 23 Sep 2011 21:44:45 +0300 Message-ID: <4E7CD39D.60205@rktmb.org> References: <4E7C9AAD.7060209@gmail.com> <4E7CCCA0.50909@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Cc: "git@vger.kernel.org" To: Jon Forrest X-From: git-owner@vger.kernel.org Fri Sep 23 20:45:09 2011 Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1R7AkE-0005Qn-VZ for gcvg-git-2@lo.gmane.org; Fri, 23 Sep 2011 20:45:07 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751472Ab1IWSpB (ORCPT ); Fri, 23 Sep 2011 14:45:01 -0400 Received: from slow3-v.mail.gandi.net ([217.70.178.89]:50904 "EHLO slow3-v.mail.gandi.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750736Ab1IWSo7 (ORCPT ); Fri, 23 Sep 2011 14:44:59 -0400 X-WhiteListed: mail was accepted with no delay X-WhiteListed: mail was accepted with no delay Received: from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net [217.70.183.196]) by slow3-v.mail.gandi.net (Postfix) with ESMTP id CA963393EE for ; Fri, 23 Sep 2011 20:44:57 +0200 (CEST) X-Originating-IP: 217.70.178.139 Received: from mfilter10-d.gandi.net (mfilter10-d.gandi.net [217.70.178.139]) by relay4-d.mail.gandi.net (Postfix) with ESMTP id BF32B172091; Fri, 23 Sep 2011 20:44:55 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mfilter10-d.gandi.net Received: from relay4-d.mail.gandi.net ([217.70.183.196]) by mfilter10-d.gandi.net (mfilter10-d.gandi.net [10.0.15.180]) (amavisd-new, port 10024) with ESMTP id DYeE1FWBfoAp; Fri, 23 Sep 2011 20:44:54 +0200 (CEST) X-Originating-IP: 41.74.212.167 Received: from [192.168.100.103] (unknown [41.74.212.167]) (Authenticated sender: out@rktmb.org) by relay4-d.mail.gandi.net (Postfix) with ESMTPSA id 4D7D0172081; Fri, 23 Sep 2011 20:44:52 +0200 (CEST) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:7.0) Gecko/20110918 Thunderbird/7.0 In-Reply-To: <4E7CCCA0.50909@gmail.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: On 09/23/2011 09:14 PM, Jon Forrest wrote: > > Thanks to (almost) everyone who has responded. I'm hoping that > others new to Git will benefit from this discussion. It does, it does... I'm working on an internal parallel documentation on using Hg and Git and this conflict resolution topic is... important. -- RMA.