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

Martin Krause Martin.Krause at tqs.de
Tue Aug 7 12:30:48 CEST 2007


u-boot-users-bounces at lists.sourceforge.net wrote on :
> 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.

Me too.

> > I would like to keep the current formatting.
> 
> I vote for the new, single-line version suggested by Kim & Jon.

Me too!

Best Regards,

Martin Krause
--
TQ-Systems GmbH
Muehlstrasse 2, Gut Delling, D-82229 Seefeld
Amtsgericht Muenchen, HRB 105 018, UST-IdNr. DE 811 607 913
Geschaeftsfuehrer: Dipl.-Ing. (FH) Detlef Schneider, Dipl.-Ing. (FH) Ruediger Stahl
http://www.tq-group.com




More information about the U-Boot mailing list