emacs-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: smerge-ediff "MINE" and "OTHER" monikers unhelpful


From: Stefan Monnier
Subject: Re: smerge-ediff "MINE" and "OTHER" monikers unhelpful
Date: Wed, 27 Nov 2013 15:46:59 -0500
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3.50 (gnu/linux)

> 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?

> I don't actually care all that much whether you want to make smerge-mode
> an intellectual challenge,

Now that was a constructive side remark,


        Stefan



reply via email to

[Prev in Thread] Current Thread [Next in Thread]