On Mon, Jun 11, 2018 at 6:44 PM Elijah Newren <newren@xxxxxxxxx> wrote: > > What about merge-recursive.c? Given that this whole thing will take > > many release cycles to finish, your work may get merged before mine > > and I could do the conversion now (and resolve conflicts and resubmit > > later). Of course if you like to keep merge-recursive.c the_index-free > > now, I will not stop you ;-) > > I was just worried that since I was making changes in > merge-recursive.c that it'd cause you conflict pain, so I offered to > convert it. If that pain doesn't bother you, feel free to do the > conversion and we'll just work through the minor conflicts as we go. > Besides, sounds like you've converted nearly all of git, so it may > make sense to just keep it together in one big series. OK let's just "quickly" get your series in then. I still have a few files to go and a couple more places to look back and ponder. I'm in no hurry to convert merge-recursive now :D -- Duy
