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

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 20878 in the body.
You can then email your comments to 20878 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

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

From: Glenn Morris <rgm <at> gnu.org>
To: submit <at> debbugs.gnu.org
Subject: smerge yours/other are backwards for git stash conflicts
Date: Tue, 23 Jun 2015 03:10:36 -0400

Package: emacs
Version: 24.5
Severity: minor

If you do

git stash
git pull
git stash pop

then if you end up with a conflict, it looks like this:

<<<<<<< Updated upstream
## Don't create ns_appbindir via an order-only prerequisite, because
=======
## Don't create ns_appbindir via an order-only prequisite, because
>>>>>>> Stashed changes

If you then do 'smerge-keep-yours' it takes the "upstream" version.
If you do 'smerge-keep-other', it takes the "stash" version.

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

(I guess it's because Git's conflicts seem to be presented the opposite
way round to those of CVS, svn, bzr, ... Because consistency is
obviously for losers.)

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

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

> 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".


        Stefan

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

From: Wolfgang Jenkner <wjenkner <at> inode.at>
To: Glenn Morris <rgm <at> gnu.org>
Cc: 20878 <at> debbugs.gnu.org
Subject: Re: 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.

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.)

Previous Next

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