From mboxrd@z Thu Jan  1 00:00:00 1970
From: Andre Schwarz <andre.schwarz@matrix-vision.de>
Date: Mon, 14 Feb 2011 10:05:19 +0100
Subject: [U-Boot] merge conflicts during git pull
In-Reply-To: <20110211191355.D0475135593@gemini.denx.de>
References: <4D555611.2040907@matrix-vision.de>
	<20110211191355.D0475135593@gemini.denx.de>
Message-ID: <4D58F04F.3080001@matrix-vision.de>
List-Id: <u-boot.lists.denx.de>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: u-boot@lists.denx.de

Wolfgang,


....
>> Have I missed anything ?
>> Is there a way to get automagically merged whatever there might be to
>> merge ?
> Sorry, I have no idea what happenend of your system.  I can see no
> issues on our side.

thank - will clone a new repo an pull in my local branches.



-- 

Regards,
Andre



MATRIX VISION GmbH, Talstrasse 16, DE-71570 Oppenweiler
Registergericht: Amtsgericht Stuttgart, HRB 271090
Geschaeftsfuehrer: Gerhard Thullner, Werner Armingeon, Uwe Furtner