GNU bug report logs - #20878
smerge yours/other are backwards for git stash conflicts

Previous Next

Package: emacs;

Reported by: Glenn Morris <rgm <at> gnu.org>

Date: Tue, 23 Jun 2015 07:11:02 UTC

Severity: minor

Found in version 24.5

Fixed in version 26.1

Done: Glenn Morris <rgm <at> gnu.org>

Bug is archived. No further changes may be made.

Full log

Message #12 received at 20878 <at> debbugs.gnu.org (full text, mbox):

From: Glenn Morris <rgm <at> gnu.org>
To: Stefan Monnier <monnier <at> IRO.UMontreal.CA>
Cc: 20878 <at> debbugs.gnu.org
Subject: Re: bug#20878: smerge yours/other are backwards for git stash
 conflicts
Date: Tue, 23 Jun 2015 11:42:45 -0400

Stefan Monnier wrote:

>> If you then do 'smerge-keep-yours' it takes the "upstream" version.
>> If you do 'smerge-keep-other', it takes the "stash" version.
>
> Yup, those names seemed like a good idea at the time, but they don't
> work well now.  We should change the names from "yours/theirs" to
> something like "upper/lower".

Works for me. (I was thinking first/second, but yours sounds better.)
This bug report was last modified 8 years and 223 days ago.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.