linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jonathan Corbet <corbet@lwn.net>
To: Andreas Gruenbacher <agruenba@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
	cluster-devel <cluster-devel@redhat.com>,
	LKML <linux-kernel@vger.kernel.org>,
	"Tobin C. Harding" <me@tobin.cc>,
	Dan Williams <dan.j.williams@intel.com>
Subject: Re: GFS2: Pull Request
Date: Wed, 8 May 2019 14:58:18 -0600	[thread overview]
Message-ID: <20190508145818.6a53dff5@lwn.net> (raw)
In-Reply-To: <CAHc6FU40HucCUzx5k2obs8m6dXS08NmXBM-tFOq7fSbLduHiGw@mail.gmail.com>

On Wed, 8 May 2019 22:17:12 +0200
Andreas Gruenbacher <agruenba@redhat.com> wrote:

> Would it make sense to describe how to deal with merge conflicts in
> Documentation/maintainer/pull-requests.rst to stop people from getting
> this wrong over and over again?

I think this certainly belongs in the maintainer manual, but probably not
in pull-requests.rst.  There are a lot of things about repository
management that seem to trip up even experienced maintainers; pre-pull
merges is just one of those.  I would love to see a proper guide on when
and how to do merges in general.

CCing Dan, who has ambitions for the maintainer manual as well, just in
case he has anything in mind here.

Thanks,

jon

  parent reply	other threads:[~2019-05-08 20:58 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-05-08 11:48 GFS2: Pull Request Andreas Gruenbacher
2019-05-08 17:55 ` Linus Torvalds
2019-05-08 18:06   ` Linus Torvalds
2019-05-08 20:17     ` Andreas Gruenbacher
2019-05-08 20:21       ` Linus Torvalds
2019-05-08 20:58       ` Jonathan Corbet [this message]
2019-05-08 21:05         ` Linus Torvalds
2019-05-08 21:50           ` Jonathan Corbet
2019-05-28 18:55   ` cross-merges with MFD tree (was: Re: GFS2: Pull Request) Jacek Anaszewski
2019-05-29 11:40     ` Lee Jones
  -- strict thread matches above, loose matches on Subject: below --
2010-05-18  8:38 GFS2: Pull request Steven Whitehouse
2010-03-02 11:03 Steven Whitehouse
2009-12-03 15:01 Steven Whitehouse
2009-09-14  8:08 Steven Whitehouse
2009-06-11 10:51 Steven Whitehouse
2009-04-15 11:26 Steven Whitehouse
2009-03-24 12:20 Steven Whitehouse
2009-01-05  9:34 Steven Whitehouse
2008-01-25  9:46 GFS2 " Steven Whitehouse

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=20190508145818.6a53dff5@lwn.net \
    --to=corbet@lwn.net \
    --cc=agruenba@redhat.com \
    --cc=cluster-devel@redhat.com \
    --cc=dan.j.williams@intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=me@tobin.cc \
    --cc=torvalds@linux-foundation.org \
    /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;
as well as URLs for NNTP newsgroup(s).