On Tue, May 23, 2023 at 12:49 PM Calvin Wan <calvinwan@xxxxxxxxxx> wrote:
>
> "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.
The path.h include is shown within the conflict markers, thus removing
it was already part of my instructions ("delete the conflict
region...").
It looks like Junio merged your series to seen first, as I was
assuming in my instructions, so this suggests there was an error of
some sort when he merged my series:
$ git show --oneline --remerge-diff
862248e47048c9282bc00ac6d9dcc7a21bd11ab1 -- strbuf.c
862248e4704 (gitster/jch, gitgitgadget/jch) Merge branch
'en/header-split-cache-h-part-3' into jch
diff --git a/strbuf.c b/strbuf.c
remerge CONFLICT (content): Merge conflict in strbuf.c
index dfaf41d2f18..37fd5247b32 100644
--- a/strbuf.c
+++ b/strbuf.c
@@ -2,16 +2,7 @@
#include "alloc.h"
#include "gettext.h"
#include "hex.h"
-<<<<<<< d1af2a2c773 (Merge branch 'la/doc-interpret-trailers' into jch)
-||||||| merged common ancestors
-#include "object-name.h"
-#include "refs.h"
-=======
-#include "object-name.h"
-#include "refs.h"
#include "path.h"
->>>>>>> d677f7e76ab (fsmonitor-ll.h: split this header out of fsmonitor.h)
-#include "repository.h"
#include "strbuf.h"
#include "string-list.h"
#include "utf8.h"
Junio: Do you want to fix/amend that merge to remove the entire
conflict region (so removing the line involving path.h too)? Or are
you preserving that line for some reason?
Anyway, not a real big deal; it'll still compile with the extra
include. If Junio doesn't tweak the merges to clean this up, then
I'll just add this into my follow-on series dealing with extra include
cleanups.
