public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
From: Stefan Roese <sr@denx.de>
To: u-boot@lists.denx.de
Subject: [U-Boot-Users] [PATCH] make MAKEALL more immune to merge conflicts
Date: Tue, 7 Aug 2007 12:21:52 +0200	[thread overview]
Message-ID: <200708071221.52633.sr@denx.de> (raw)
In-Reply-To: <20070807064848.718033535CD@atlas.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
=====================================================================

  reply	other threads:[~2007-08-07 10:21 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-08-07  0:06 [U-Boot-Users] [PATCH] make MAKEALL more immune to merge conflicts Kim Phillips
2007-08-07  6:48 ` Wolfgang Denk
2007-08-07 10:21   ` Stefan Roese [this message]
2007-08-07 10:30     ` [U-Boot-Users] [PATCH] make MAKEALL more immune to mergeconflicts Martin Krause
2007-08-08 12:39       ` David Saada
2007-08-08 15:43         ` Wolfgang Denk
2007-08-08 15:59           ` Jon Loeliger
2007-08-08 18:03             ` Wolfgang Denk
2007-08-09  8:55               ` David Saada
2007-08-10 15:40                 ` Grant Likely
2007-08-10 15:56                 ` Wolfgang Denk
2007-08-09  2:49           ` Timur Tabi
2007-08-08 16:50     ` [U-Boot-Users] [PATCH] make MAKEALL more immune to merge conflicts Detlev Zundel
2007-08-08 18:09       ` Wolfgang Denk
2007-08-10  7:54         ` Kim Phillips
2007-08-10  8:44           ` Wolfgang Denk
2007-08-07 16:23   ` Kim Phillips

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=200708071221.52633.sr@denx.de \
    --to=sr@denx.de \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox