From: Michael Ernst <mernst@cs.washington.edu>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: Feature request: a merge strategy that makes any file difference a merge conflict
Date: Fri, 29 Mar 2024 13:43:53 -0700 [thread overview]
Message-ID: <CAAJCdQQceA7yANHCPzUGbANR-XKVDUzfN5ym6Rb-oEWgcq=4Uw@mail.gmail.com> (raw)
In-Reply-To: <xmqqfrw8ygg2.fsf@gitster.g>
Junio-
Thank you for the clarification. There is a lot of misleading
information about this on the Internet.
I was mistaken about when a merge driver is called. Now I see that
the merge driver is called anytime that no two of
{base,parent1,parent2} are the same. This means that a merge driver
*can* prevent a clean-but-incorrect merge. I was right that a
mergetool cannot be used to correct a clean-but-incorrect merge.
-Mike
next prev parent reply other threads:[~2024-03-29 20:44 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-29 19:20 Feature request: a merge strategy that makes any file difference a merge conflict Michael Ernst
2024-03-29 19:40 ` Junio C Hamano
2024-03-29 20:43 ` Michael Ernst [this message]
2024-04-01 11:00 ` Thomas Braun
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='CAAJCdQQceA7yANHCPzUGbANR-XKVDUzfN5ym6Rb-oEWgcq=4Uw@mail.gmail.com' \
--to=mernst@cs.washington.edu \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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 read-only IMAP folder(s) and NNTP newsgroup(s).