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

View this message in rfc822 format

From: Wolfgang Jenkner <wjenkner <at> inode.at>
To: Glenn Morris <rgm <at> gnu.org>
Cc: 20878 <at> debbugs.gnu.org
Subject: bug#20878: smerge yours/other are backwards for git stash conflicts
Date: Tue, 23 Jun 2015 17:04:19 +0200

On Tue, Jun 23 2015, Glenn Morris wrote:

> This seems backwards to me. The stash is my version, the upstream is the
> other version.

I think that's similar to what happens while rebasing; git-rebase(1)
explains this in the description of the -m switch.

So, swapping "mine" with "other" would be equally confusing for many
people.
This bug report was last modified 8 years and 227 days ago.

Previous Next

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