mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Linus Torvalds <torvalds@linux-foundation.org>
To: Timothy Shimmin <tes@sgi.com>
Cc: akpm@linux-foundation.org, xfs@oss.sgi.com, linux-kernel@vger.kernel.org
Subject: Re: [GIT PULL] XFS update
Date: Thu, 19 Jul 2007 18:15:58 -0700 (PDT)	[thread overview]
Message-ID: <alpine.LFD.0.999.0707191811550.27249@woody.linux-foundation.org> (raw)
In-Reply-To: <46A00752.4040103@sgi.com>



On Fri, 20 Jul 2007, Timothy Shimmin wrote:
> 
> The window between pulling in and applying changes was obviously
> large enough for Nick's changes to get in.

Don't worry.

Basically, merging is my job, and I happily do it. If I hit something that 
makes me nervous enough, I'll just push back and say "please merge this 
for me", but if I merge up conflicts on my own, I generally just let 
people know that I did it - not because it's a *problem*, but as a 
heads-up to let people know that they should double-check the end result.

Quite frankly, real merge conflicts happen rarely enough that it really 
isn't a problem. And 99% of the time, the conflicts are really pretty damn 
obvious, and doing them isn't a problem at all. So even when I ask people 
to "please check", most of the time I expect that the end result is fine.

So my "please double-check" was in no way meant to be a criticism or a 
"please do this better next time". It was _literally_ just meant to be 
just that and nothing more: a "please double-check", especially since for 
something like XFS, I'm not actually doing any testing personally.

So no worries.

		Linus

      reply	other threads:[~2007-07-20  1:16 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-07-19 14:20 Tim Shimmin
2007-07-19 22:29 ` Linus Torvalds
2007-07-20  0:52   ` Timothy Shimmin
2007-07-20  1:15     ` Linus Torvalds [this message]

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=alpine.LFD.0.999.0707191811550.27249@woody.linux-foundation.org \
    --to=torvalds@linux-foundation.org \
    --cc=akpm@linux-foundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=tes@sgi.com \
    --cc=xfs@oss.sgi.com \
    /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

all inboxes | Powered by JetHome®