[U-Boot-Users] [PATCH] make MAKEALL more immune to merge conflicts

Stefan Roese sr at denx.de
Tue Aug 7 12:21:52 CEST 2007


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
=====================================================================




More information about the U-Boot mailing list