From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 17 Oct 2016 17:51:49 GMT
Subject: Re: Merge conflicts in .gitattributes can cause trouble
Message-ID: <xmqqvawqvp6y.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <alpine.DEB.2.20.1610171803400.197091@virtualbox>

Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:

> I would vote for:
>
> 4. We keep letting Git read in the *current* version of .gitattributes
>    *before* the merge, and apply those attributes while performing the
>    merge.

Even though this needs a major surgery to the way the attr subsystem
reads from these files, I think it is conceptually the cleanest.