From: Glenn Morris <rgm@gnu.org>
To: 20878@debbugs.gnu.org
Subject: bug#20878: smerge yours/other are backwards for git stash conflicts
Date: Tue, 23 Jun 2015 03:10:36 -0400 [thread overview]
Message-ID: <rmh9pyaoib.fsf@fencepost.gnu.org> (raw)
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.)
next reply other threads:[~2015-06-23 7:10 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-23 7:10 Glenn Morris [this message]
2015-06-23 13:37 ` bug#20878: smerge yours/other are backwards for git stash conflicts Stefan Monnier
2015-06-23 15:42 ` Glenn Morris
2015-06-23 15:04 ` Wolfgang Jenkner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=rmh9pyaoib.fsf@fencepost.gnu.org \
--to=rgm@gnu.org \
--cc=20878@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.