Re: [PATCH 0/5] Refactor excludes library
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Sep 6, 2019, 20:34 UTC
- Message-ID
- <xmqqtv9pmaf7.fsf@gitster-ct.c.googlers.com>
- In-Reply-To
- <pull.329.git.gitgitgadget@gmail.com>
"Derrick Stolee via GitGitGadget" <gitgitgadget@gmail.com> writes:
Show 7 quoted lines
> I had started working on v2.23.0, but found adjacent-diff conflicts with > md/list-objects-filter-combo [2] and js/partial-clone-sparse-blob [3]. Those > branches are independent, but the conflicts with > md/list-objects-filter-combo were more severe (and that branch seems closer > to merging) so this is based on md/list-object-filter-combo. Hopefully the > conflicts with js/partial-clone-sparse-blob are clear enough to resolve > easily.
Thanks.
I did screw the resolution up in previous integration, but I think what we have today is in a good shape.