Hi Junio, On Wed, 7 Mar 2018, Junio C Hamano wrote: > Johannes Schindelin <Johannes.Schindelin@xxxxxx> writes: > > >> OK, does this mean we want to wait before merging the "recreate > >> merge" topic down to 'next'? For more than a few weeks, it has been > >> slated for 'next'. > > > > Maybe a few more days. > > ... > > I want to discuss this in the other subthread, though. > > If we are talking about a drastic change, a few more days may not be > sufficient, but we are not in a hurry, as this already sounds like a > 2.18 material anyway. It is not at all a drastic change. It will actually make the current patch series better (simplifying the "can we fast-forward?" check). I just want to make sure that I already have Phillip's strategy working, but it will be yet another topic branch on top of the topic branch that will add support for octopus merges *after* the current --recreate-merges topic branch ;-) > As you made it clear that it is OK not to merge the current one for now, > my objective of asking the question is already satisfied ;-) Depending how much GitMerge will occupy my time, I hope to have something polished by tomorrow. Ciao, Dscho
