From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RsvxK-0006HA-GY for garchives@archives.gentoo.org; Thu, 02 Feb 2012 12:40:02 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 575B4E067D; Thu, 2 Feb 2012 12:39:54 +0000 (UTC) Received: from mail-ee0-f53.google.com (mail-ee0-f53.google.com [74.125.83.53]) by pigeon.gentoo.org (Postfix) with ESMTP id 0308EE067D for ; Thu, 2 Feb 2012 12:39:53 +0000 (UTC) Received: by eeke51 with SMTP id e51so761167eek.40 for ; Thu, 02 Feb 2012 04:39:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=message-id:date:from:user-agent:mime-version:to:subject:references :in-reply-to:content-type:content-transfer-encoding; bh=ikVRzv2StTcyE5vywemXfOW0DahVkGmdACrf/Evv1SE=; b=kwMJNvs7S5kteeRTT07zaLBZV58LWKgUrKC8zd/6m8C7IupYAPv4lg22uwXsxrf7GS 9RI2sZdBKLVDpHzD/jnZnOgZ1CaPatR75eUOLU7jtnAaOufR35xmbth4cBKoVrAN/Nkp bQ8Ufug1sxeO9gxKfIfCYw+J/v7u2su193P6A= Received: by 10.14.2.141 with SMTP id 13mr906994eef.9.1328186393115; Thu, 02 Feb 2012 04:39:53 -0800 (PST) Received: from [192.168.1.68] (host41-64-dynamic.16-79-r.retail.telecomitalia.it. [79.16.64.41]) by mx.google.com with ESMTPS id a58sm8809930eeb.8.2012.02.02.04.39.50 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 02 Feb 2012 04:39:51 -0800 (PST) Message-ID: <4F2A84E3.7000408@gmail.com> Date: Thu, 02 Feb 2012 13:43:15 +0100 From: Daniele Segato User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:10.0) Gecko/20120129 Thunderbird/10.0 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-docs-it@lists.gentoo.org Reply-to: gentoo-docs-it@lists.gentoo.org MIME-Version: 1.0 To: gentoo-docs-it@lists.gentoo.org Subject: [gentoo-docs-it] Re: howto su git - Note sul PDF References: <4F2A80AA.9090707@gmail.com> In-Reply-To: <4F2A80AA.9090707@gmail.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 0ee516d7-608d-4de2-89f9-7761f9a17402 X-Archives-Hash: 78a980d1be008af1643e9251a442a1c2 On 02/02/2012 01:25 PM, Daniele Segato wrote: > se non vi ricordate com'era C potrebbe non essere facile capire cosa si > vuole ottenere > > con il comando dato sopra: > git config --global merge.conflictstyle diff3 precisazione: il comando qui sopra non va eseguito tutte le volte, =E8 un= a=20 configurazione, basta eseguirlo una volta ai successivi conflitti git vi mostrer=E0 anche la situazione nell'ultimo= =20 commit in comune > > si ottiene invece questo: >

> <<<<<<< HEAD > Gentoo =E8 una distribuzione versatile e magnifica da personalizzare! > ||||||| merged common ancestors > Gentoo =E8 una distribuzione versatile e magnifica! > =3D=3D=3D=3D=3D=3D=3D > Gentoo =E8 sempre stata una distribuzione versatile e magnifica! > >>>>>>> foo >