"Elijah Newren via GitGitGadget" <gitgitgadget@xxxxxxxxx> writes: > * a textual & semantic conflict with cw/strbuf-cleanup (affecting strbuf.c; > to address, delete the conflict region and also delete the include of > repository.h) In patch 19, you also include path.h into strbuf.c because before my series, strbuf.c had a dependency on repository.h. Since that dependency is removed, there is no need to include path.h anymore.