From: Junio C Hamano <gitster@pobox.com>
To: Matt Turner <mattst88@gentoo.org>
Cc: gentoo-portage-dev@lists.gentoo.org, git@vger.kernel.org
Subject: Re: [RFC PATCH gentoolkit] bin: Add merge-driver-ekeyword
Date: Wed, 23 Dec 2020 22:13:46 -0800 [thread overview]
Message-ID: <xmqqmty34tph.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <CAEdQ38En=HrG9A0STgaxFAwqxBjwNGQoV=U26Pia3x=gd-Attg@mail.gmail.com> (Matt Turner's message of "Wed, 23 Dec 2020 23:47:22 -0500")
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.
prev parent reply other threads:[~2020-12-24 6:14 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20201221034452.307153-1-mattst88@gentoo.org>
2020-12-22 22:40 ` [RFC PATCH gentoolkit] bin: Add merge-driver-ekeyword Matt Turner
2020-12-23 18:11 ` Beat Bolli
2020-12-23 19:46 ` Junio C Hamano
2020-12-23 19:45 ` Junio C Hamano
2020-12-24 4:47 ` Matt Turner
2020-12-24 6:13 ` Junio C Hamano [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqmty34tph.fsf@gitster.c.googlers.com \
--to=gitster@pobox.com \
--cc=gentoo-portage-dev@lists.gentoo.org \
--cc=git@vger.kernel.org \
--cc=mattst88@gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).