* dealing with conflicting pull requests
@ 2015-07-09 10:39 Loic Dachary
2015-07-09 10:55 ` Nathan Cutler
2015-07-09 14:00 ` Loic Dachary
0 siblings, 2 replies; 3+ messages in thread
From: Loic Dachary @ 2015-07-09 10:39 UTC (permalink / raw)
To: Shu, Xinxin, Nathan Cutler, Abhishek L; +Cc: Ceph Development
[-- Attachment #1: Type: text/plain, Size: 750 bytes --]
Dear co-backporters,
For the first time we have a few conflicting pull requests that prevent merging all in the integration branch.
https://github.com/ceph/ceph/pull/4597
https://github.com/ceph/ceph/pull/5043
https://github.com/ceph/ceph/pull/4788
https://github.com/ceph/ceph/pull/4636
https://github.com/ceph/ceph/pull/4635
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 ?
--
Loïc Dachary, Artisan Logiciel Libre
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: dealing with conflicting pull requests
2015-07-09 10:39 dealing with conflicting pull requests Loic Dachary
@ 2015-07-09 10:55 ` Nathan Cutler
2015-07-09 14:00 ` Loic Dachary
1 sibling, 0 replies; 3+ messages in thread
From: Nathan Cutler @ 2015-07-09 10:55 UTC (permalink / raw)
To: Loic Dachary, Shu, Xinxin, Abhishek L; +Cc: Ceph Development
> 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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: dealing with conflicting pull requests
2015-07-09 10:39 dealing with conflicting pull requests Loic Dachary
2015-07-09 10:55 ` Nathan Cutler
@ 2015-07-09 14:00 ` Loic Dachary
1 sibling, 0 replies; 3+ messages in thread
From: Loic Dachary @ 2015-07-09 14:00 UTC (permalink / raw)
To: Shu, Xinxin, Nathan Cutler, Abhishek L; +Cc: Ceph Development
[-- Attachment #1: Type: text/plain, Size: 1013 bytes --]
On 09/07/2015 12:39, Loic Dachary wrote:
> Dear co-backporters,
>
> For the first time we have a few conflicting pull requests that prevent merging all in the integration branch.
>
> https://github.com/ceph/ceph/pull/4597
> https://github.com/ceph/ceph/pull/5043
> https://github.com/ceph/ceph/pull/4788
> https://github.com/ceph/ceph/pull/4636
> https://github.com/ceph/ceph/pull/4635
I'll merge
https://github.com/ceph/ceph/pull/4636
https://github.com/ceph/ceph/pull/4635
https://github.com/ceph/ceph/pull/4597
and keep the other two as DNM for later then.
>
> 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 ?
>
--
Loïc Dachary, Artisan Logiciel Libre
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-07-09 14:01 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-07-09 10:39 dealing with conflicting pull requests Loic Dachary
2015-07-09 10:55 ` Nathan Cutler
2015-07-09 14:00 ` Loic Dachary
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.