From: Nathan Cutler <ncutler@suse.cz>
To: Loic Dachary <loic@dachary.org>,
"Shu, Xinxin" <xinxin.shu@intel.com>,
Abhishek L <abhishek.lekshmanan@gmail.com>
Cc: Ceph Development <ceph-devel@vger.kernel.org>
Subject: Re: dealing with conflicting pull requests
Date: Thu, 09 Jul 2015 12:55:50 +0200 [thread overview]
Message-ID: <559E5336.6040704@suse.cz> (raw)
In-Reply-To: <559E4F52.9070007@dachary.org>
> For the first time we have a few conflicting pull requests that prevent merging all in the integration branch.
...
> I think the simplest way to deal with that is to arbitrarily pick a few that apply cleanly and just DNM the others so they wait for the next round of integration testing. After the first round of integration test, the chosen one will be merged and the DNM will have to be rebased to resolve the conflict, but that's what we do routinely.
>
> What do you think ?
I think your suggestion is reasonable and I can't think of any better
way to proceed, so +1 !
Nathan
next prev parent reply other threads:[~2015-07-09 10:55 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-09 10:39 dealing with conflicting pull requests Loic Dachary
2015-07-09 10:55 ` Nathan Cutler [this message]
2015-07-09 14:00 ` Loic Dachary
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=559E5336.6040704@suse.cz \
--to=ncutler@suse.cz \
--cc=abhishek.lekshmanan@gmail.com \
--cc=ceph-devel@vger.kernel.org \
--cc=loic@dachary.org \
--cc=xinxin.shu@intel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.