On 10/8/2019 4:58 AM, Johannes Schindelin wrote:
> Hi Eric & Junio,
> On Sun, 6 Oct 2019, Eric Wong wrote:
>> v3 changes:
>> - use __typeof__ to avoid invalid clang warning on uninitialized var
>> - formatting fixes recommended by Stolee
>> - add Reviewed-by for Stolee
>> - add patch 20 to update docs to drop first member requirement
> This has quite a bit of fallout, even more than previous rounds, it
> seems. I need at least these fixup???s to fix the build of `pu`:
> https://github.com/git-for-windows/git/commit/f74259754971b427a14e6290681e18950824b99d
> https://github.com/git-for-windows/git/commit/124c8bc08e974e76ca7d956dc07eb288e71d639e
> https://github.com/git-for-windows/git/commit/45948433d1b48ff513fbd37f134c0f1491c78192
> Junio, feel free to fetch and squash those into the appropriate merge
> commit(s) (I feel that 4432e8b5f36 (Merge branch 'ds/sparse-cone' into
> pu, 2019-10-08) may be the right spot).

I expected that my series would have semantic conflicts with this series [1].
I could re-work my code to take these changes into account, based on an
appropriate merge of ds/include-exclude and ew/hashmap. ew/hashmap is likely
much closer to merging than ds/sparse-cone.

Thanks for doing most of the heavy lifting, Johannes! I'll probably start by
taking your fixups into the appropriate commits of my series.


[1] https://public-inbox.org/git/d16b22c9-c437-0947-fb5a-9421f987a...@gmail.com/

Reply via email to