From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bernhard Fischer Date: Mon, 9 Jul 2007 20:22:22 +0200 Subject: [Buildroot] gnuconfig not up to date, but update gives conflicts during merge In-Reply-To: <1183954608.5534.32.camel@elrond.sweden.atmel.com> References: <1183954608.5534.32.camel@elrond.sweden.atmel.com> Message-ID: <20070709182222.GA24951@aon.at> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: buildroot@busybox.net On Mon, Jul 09, 2007 at 06:16:48AM +0200, Ulf Samuelsson wrote: >Checked if gnuconfig was up to date >Seems it was not, but cvs up was not clean. >What do we do? We usually update if needed. This message leads me to think that you require (or at least want) it to be updated. Well, try r19055