* bug#20878: smerge yours/other are backwards for git stash conflicts
@ 2015-06-23 7:10 Glenn Morris
2015-06-23 13:37 ` Stefan Monnier
2015-06-23 15:04 ` Wolfgang Jenkner
0 siblings, 2 replies; 4+ messages in thread
From: Glenn Morris @ 2015-06-23 7:10 UTC (permalink / raw)
To: 20878
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.)
^ permalink raw reply [flat|nested] 4+ messages in thread
* bug#20878: smerge yours/other are backwards for git stash conflicts
2015-06-23 7:10 bug#20878: smerge yours/other are backwards for git stash conflicts Glenn Morris
@ 2015-06-23 13:37 ` Stefan Monnier
2015-06-23 15:42 ` Glenn Morris
2015-06-23 15:04 ` Wolfgang Jenkner
1 sibling, 1 reply; 4+ messages in thread
From: Stefan Monnier @ 2015-06-23 13:37 UTC (permalink / raw)
To: Glenn Morris; +Cc: 20878
> 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
^ permalink raw reply [flat|nested] 4+ messages in thread* bug#20878: smerge yours/other are backwards for git stash conflicts
2015-06-23 13:37 ` Stefan Monnier
@ 2015-06-23 15:42 ` Glenn Morris
0 siblings, 0 replies; 4+ messages in thread
From: Glenn Morris @ 2015-06-23 15:42 UTC (permalink / raw)
To: Stefan Monnier; +Cc: 20878
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.)
^ permalink raw reply [flat|nested] 4+ messages in thread
* bug#20878: smerge yours/other are backwards for git stash conflicts
2015-06-23 7:10 bug#20878: smerge yours/other are backwards for git stash conflicts Glenn Morris
2015-06-23 13:37 ` Stefan Monnier
@ 2015-06-23 15:04 ` Wolfgang Jenkner
1 sibling, 0 replies; 4+ messages in thread
From: Wolfgang Jenkner @ 2015-06-23 15:04 UTC (permalink / raw)
To: Glenn Morris; +Cc: 20878
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.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-06-23 15:42 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-06-23 7:10 bug#20878: smerge yours/other are backwards for git stash conflicts Glenn Morris
2015-06-23 13:37 ` Stefan Monnier
2015-06-23 15:42 ` Glenn Morris
2015-06-23 15:04 ` Wolfgang Jenkner
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.