Return-path: Received: from ra.tuxdriver.com ([70.61.120.52]:4919 "EHLO ra.tuxdriver.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751987AbYAICT6 (ORCPT ); Tue, 8 Jan 2008 21:19:58 -0500 Date: Tue, 8 Jan 2008 20:51:02 -0500 From: "John W. Linville" To: bruno randolf Cc: linux-wireless Subject: Re: merge errors on 'everything' Message-ID: <20080109015102.GB3048@tuxdriver.com> (sfid-20080109_022003_497153_4BF2E3E1) References: <200801091043.02204.bruno@thinktube.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii In-Reply-To: <200801091043.02204.bruno@thinktube.com> Sender: linux-wireless-owner@vger.kernel.org List-ID: On Wed, Jan 09, 2008 at 10:43:01AM +0900, bruno randolf wrote: > hi! > > many times when i do a 'git pull' to update the wireless-2.6 'everything' > branch i run into unexplicable merge errors. > > i created the branch with 'git co --track -b everything origin/everything' and > i don't work on this branch so all files are un-modified. > > what am i doing wrong? You'll need to get a fresh clone of the repository -- sorry. -- John W. Linville linville@tuxdriver.com