On Mon, Apr 15, 2019 at 12:30 PM Junio C Hamano <gitster@xxxxxxxxx> wrote: > > Junio C Hamano <gitster@xxxxxxxxx> writes: > > > Christian Couder <christian.couder@xxxxxxxxx> writes: > > > >> This patch series is based on: > >> > >> 763fb763b8 (Merge branch 'jt/batch-fetch-blobs-in-diff' into jch, 2019-04-08) > >> > >> to avoid issues with jt/batch-fetch-blobs-in-diff. > > ... > > If you really need to depend on another topic or two, please base > > your work on a merge between 'master' (or some well known ancestor > > of it) and the tips of the topics instead. > > Well, I've done this myself by first queuing these on 763fb763b8 and > then made a merge between jt/batch-fetch-blobs-in-diff and master > and applied these pathes on top of the result. You should be able > to see the resulting topic replacing the old one in 'pu' in todays > pushout. Thanks, I will take a look. > Now I can lose the semantic conflict resolution the rebuilding > machinery was keeping, which makes things a bit simpler ;-) Yeah, nice!
