From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stefan Roese <sr@denx.de>
Date: Tue, 7 Aug 2007 12:21:52 +0200
Subject: [U-Boot-Users] [PATCH] make MAKEALL more immune to merge
	conflicts
In-Reply-To: <20070807064848.718033535CD@atlas.denx.de>
References: <20070807064848.718033535CD@atlas.denx.de>
Message-ID: <200708071221.52633.sr@denx.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

Hi Wolfgang,

On Tuesday 07 August 2007, Wolfgang Denk wrote:
> Now your list version is about 4 times as long, and needs more than 2
> pages on the (pretty big) window size I'm using. That's much harder to
> read.
>
> As for the merge conflict problem: yes,  this  happens  occasionally,
> but not very frequently, and this type of merge conflicts are easy to
> resolve.

I happens to me quite often and I don't see a big advantage in the overview 
view for all the boards on one page.

> I would like to keep the current formatting.

I vote for the new, single-line version suggested by Kim & Jon.

Best regards,
Stefan

=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80  Email: office at denx.de
=====================================================================