Hi Junio, Junio C Hamano wrote: > * rr/revert-cherry-pick (2011-10-23) 5 commits > (merged to 'next' on 2011-10-26 at 27b7496) > [...] > > The internals of "git revert/cherry-pick" has been further refactored to > serve as the basis for the sequencer. > > Is this ready for 'master', or should we eject it to 'pu', expecing a > re-roll? [Notation: `rr/sequencer` is a new series I'm working on based on `rr/revert-cherry-pick`] I'm confused and I need your advice. I've stopped working on `rr/sequencer` because this branch is out-of-date now. We can do one of the following the improve the situation: 0. You can merge this into `master` resolving the conflicts: it's a fairly straightforward resolution. As soon as you publish the new `master`, I can continue working on `rr/sequencer`. 1. I can post the `rr/revert-cherry-pick` to the list, hoping that it will make it to `master` without more disruptions. I can rebase `rr/sequencer` on this new series and continue working. For your reference, this [1] is what I'll be posting to the list if we pick this option. 2. I can squash `rr/sequencer` into `rr/revert-cherry-pick` to post an entirely new series. I think this is a really bad option. Thanks. -- Ram [1]: https://github.com/artagnon/git/commits/rr/revert-cherry-pick -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html