From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 22 Apr 2019 06:30:34 GMT
Subject: Re: [PATCH] cache.h: fix mismerge of 'dl/no-extern-in-func-decl'
Message-ID: <xmqqzhoi7drp.fsf@gitster-ct.c.googlers.com>
In-Reply-To: <9d6c51b2118b24cd94f3e2951ff0e9ee82afbd98.1555911520.git.liu.denton@gmail.com>

Denton Liu <liu.denton@gmail.com> writes:

> After merging 'dl/no-extern-in-func-decl' into 'pu', it seems like the
> conflict resolution mostly went well except for one spot, which this
> patch should fix.

I do not think this is a mismerge per-se.

That line is not touched since this February at 7589e636 ("Merge
branch 'nd/the-index-final'", 2019-02-06).

It is just that large scale churning on a common and busy file like
cache.h is bound to cause painful conflicts with other topics, both
textual and non-textual.  As these "extern" in *.h that explicitly
marks that they are merely decls and not defunitions do not hurt
anybody, I think it is better to leave it to a cleanup pass at the
end of the tunnel after things gradulate to 'master' and start to
calm down.

Thanks.