From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.176.0/21 X-Spam-Status: No, score=-3.5 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MSGID_FROM_MTA_HEADER,RP_MATCHES_RCVD shortcircuit=no autolearn=ham autolearn_force=no version=3.4.0 From: Wink Saville Subject: Re: Resolving conflicts Date: Fri, 01 Dec 2006 19:04:09 -0800 Message-ID: <4570ED29.6030507@saville.com> References: <456FD461.4080002@saville.com> <456FE642.6020102@saville.com> <200612012347.55294.alan@chandlerfamily.org.uk> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15; format=flowed Content-Transfer-Encoding: 7bit NNTP-Posting-Date: Sat, 2 Dec 2006 03:04:32 +0000 (UTC) Cc: git@vger.kernel.org Return-path: Envelope-to: gcvg-git@gmane.org User-Agent: Thunderbird 1.5.0.8 (Windows/20061025) In-Reply-To: <200612012347.55294.alan@chandlerfamily.org.uk> Precedence: bulk X-Mailing-List: git@vger.kernel.org Archived-At: Received: from vger.kernel.org ([209.132.176.167]) by ciao.gmane.org with esmtp (Exim 4.43) id 1GqLAx-00018U-Fq for gcvg-git@gmane.org; Sat, 02 Dec 2006 04:04:27 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1162745AbWLBDEH (ORCPT ); Fri, 1 Dec 2006 22:04:07 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1162746AbWLBDEH (ORCPT ); Fri, 1 Dec 2006 22:04:07 -0500 Received: from 70-91-206-233-BusName-SFBA.hfc.comcastbusiness.net ([70.91.206.233]:28585 "EHLO saville.com") by vger.kernel.org with ESMTP id S1162745AbWLBDEE (ORCPT ); Fri, 1 Dec 2006 22:04:04 -0500 Received: from [192.168.0.52] (unknown [192.168.0.52]) by saville.com (Postfix) with ESMTP id 601E15780F; Fri, 1 Dec 2006 19:00:06 -0800 (PST) To: Alan Chandler Sender: git-owner@vger.kernel.org Alan Chandler wrote: > On Friday 01 December 2006 08:22, Wink Saville wrote: > >> Ubuntu is debian based and I use Synaptic GUI, a front end to apt-get. My >> earlier problem was I couldn't find which package "merge" was in. But now I >> just figured it out by going to debian.org and using "Search the contents >> of packages" for "merge". Turns out "merge" is in devel/rcs which of course >> the whole world knows, unless your a neophyte like me:) > > I'm actually using Debian Unstable and basically use the git-core package. Its > at version 1.4.4.1 - so right up to date, and of course resolves all > dependencies automatically. > > Doesn't Ubuntu have git-core in its repository? > It was an older version, so I started at the source. W