Hi Junio,
Le 29/10/2018 à 04:05, Junio C Hamano a écrit :
> Alban Gruin <alban.gruin@xxxxxxxxx> writes:
[…]
>> It is based onto ag/rebase-i-in-c (34b4731, "rebase -i: move
>> rebase--helper modes to rebase--interactive").
>
> As there are quite a lot of fixes to the sequencer machinery since
> that topic forked from the mainline. For example, [06/16] has
> unpleasant merge conflicts with 1ace63bc ("rebase --exec: make it
> work with --rebase-merges", 2018-08-09) that has been in master for
> the past couple of months. IOW, the tip of ag/rebase-i-in-c is a
> bit too old a base to work on by now.
>
> I think I queued the previous round on the result of merging
> ag/rebase-i-in-c into master, i.e. 61dc7b24 ("Merge branch
> 'ag/rebase-i-in-c' into ag/sequencer-reduce-rewriting-todo",
> 2018-10-09). That may be a more reasonable place to start this
> update on.
>
Right.
My next iteration will be based on 61dc7b24, I just rebased my branch
onto it.
