Re: [PATCH v5 00/16] Many promisor remotes
- Date: Mon, 15 Apr 2019 18:27:45 +0900
- From: Junio C Hamano <gitster@xxxxxxxxx>
- Subject: Re: [PATCH v5 00/16] Many promisor remotes
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.
Yuck. As an experienced contributor, you should know better than
that by now to do that. A merge into jch/pu are rebuilt at least
once and often three times a day, and in no way a good solid base
to build on top.
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.
Having said that, I thought that the semantic conflict has been
corrected and the machinery to rebuild 'pu' has been replaying the
correct resolution ever since, so there was no need for such a
rebase? Isn't it the case and do we still have the breakage due to
semantic conflict with JTan's topic in 'pu'?