From: David Kastrup <dak@gnu.org>
To: Stefan Monnier <monnier@iro.umontreal.ca>
Cc: emacs-devel@gnu.org
Subject: Re: smerge-ediff "MINE" and "OTHER" monikers unhelpful
Date: Wed, 27 Nov 2013 21:54:02 +0100 [thread overview]
Message-ID: <87mwkpd0r9.fsf@fencepost.gnu.org> (raw)
In-Reply-To: <jwv1u21lgl7.fsf-monnier+emacs@gnu.org> (Stefan Monnier's message of "Wed, 27 Nov 2013 15:46:59 -0500")
Stefan Monnier <monnier@iro.umontreal.ca> writes:
>> Whenever you use _meaning_-carrying names, they'll be wrong half of the
>> time. Ediff got that right with A, B, and, uh, C? No idea (rarely use
>> three-way conflicts). It's arbitrary what the first and the second
>> _mean_, so you just put them first and second on screen and give them A
>> and B as monikers.
>
> For three-way merges, the 3rd is called "BASE" in smerge, which makes
> sense, no matter how you get that result. Using A/B/Base is not great
> because of the conflicting first letter of B and Base.
> Maybe we could go with X/Y/Base?
Well, I don't see why "BASE" needs to have a meaning-carrying name while
the others don't, but it could be "C" for "Common ancestor". Or "R" for
"Root". But the latter is probably a really bad idea in connection with
ediff bindings.
--
David Kastrup
next prev parent reply other threads:[~2013-11-27 20:54 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <87zjowpn2s.fsf@fencepost.gnu.org>
2013-11-23 1:42 ` smerge-ediff "MINE" and "OTHER" monikers unhelpful Stefan Monnier
2013-11-23 6:23 ` David Kastrup
2013-11-23 14:33 ` Stefan Monnier
2013-11-23 15:03 ` David Kastrup
2013-11-23 14:07 ` David Kastrup
2013-11-25 15:40 ` Stefan Monnier
2013-11-27 10:45 ` David Kastrup
2013-11-27 17:37 ` Stefan Monnier
2013-11-27 18:07 ` David Kastrup
2013-11-27 18:45 ` David Kastrup
2013-11-27 20:46 ` Stefan Monnier
2013-11-27 20:54 ` David Kastrup [this message]
2013-11-28 8:44 ` Thien-Thi Nguyen
2013-11-28 18:31 ` Stefan Monnier
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=87mwkpd0r9.fsf@fencepost.gnu.org \
--to=dak@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=monnier@iro.umontreal.ca \
/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.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.