Return-path: <linux-wireless-owner@vger.kernel.org>
Received: from mail30f.wh2.ocn.ne.jp ([220.111.41.203]:34005 "HELO
	mail30f.wh2.ocn.ne.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with SMTP id S1752691AbYAIBnL (ORCPT
	<rfc822;linux-wireless@vger.kernel.org>);
	Tue, 8 Jan 2008 20:43:11 -0500
Received: from vs30f.wh2.ocn.ne.jp (60.43.129.4)
	by mail30f.wh2.ocn.ne.jp (RS ver 1.0.95vs) with SMTP id 2-0495672982
	for <linux-wireless@vger.kernel.org>; Wed,  9 Jan 2008 10:43:08 +0900 (JST)
From: bruno randolf <bruno@thinktube.com>
To: linux-wireless <linux-wireless@vger.kernel.org>
Subject: merge errors on 'everything'
Date: Wed, 9 Jan 2008 10:43:01 +0900
MIME-Version: 1.0
Content-Type: text/plain;
  charset="us-ascii"
Message-Id: <200801091043.02204.bruno@thinktube.com> (sfid-20080109_014315_331178_2F98CBEB)
Sender: linux-wireless-owner@vger.kernel.org
List-ID: <linux-wireless.vger.kernel.org>

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?

bruno