From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 24 Dec 2020 06:13:46 GMT
Subject: Re: [RFC PATCH gentoolkit] bin: Add merge-driver-ekeyword
Message-ID: <xmqqmty34tph.fsf@gitster.c.googlers.com>
In-Reply-To: <CAEdQ38En=HrG9A0STgaxFAwqxBjwNGQoV=U26Pia3x=gd-Attg@mail.gmail.com>

Matt Turner <mattst88@gentoo.org> writes:

> ... is there a way git can be configured to
> fallback to another merge driver if the first returns a non-zero
> status due to unresolved conflicts? For example, if there are changes
> to other lines, how can I fall back to another merge driver?

There is no "fallback", but a merge driver should be able to first
run another merge driver (e.g. "git merge-file" or the "merge"
command from the RCS suite of programs would be line-oriented 3-way
drivers suitable for text files) and then fix up the leftover bits.

If your users don't want to contaminate the .gitattributes file that
is recorded in-tree, they can also use .git/info/attributes to locally
configure Git to use such a driver.