Re: [RFC PATCH gentoolkit] bin: Add merge-driver-ekeyword

Matt Turner <[email protected]> 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.