From: KES <kes-kes@yandex.ru>
To: git <git@vger.kernel.org>
Subject: Can not save changes into stash
Date: Wed, 09 May 2018 16:25:15 +0300 [thread overview]
Message-ID: <6015131525872315@web37g.yandex.ru> (raw)
How to reproduce:
$ git update-index --skip-worktree conf/local.conf
$ git pull
Updating 0cd50c7..bde58f8
error: Your local changes to the following files would be overwritten by merge:
conf/local.conf
Please commit your changes or stash them before you merge.
Aborting
$ git stash save
No local changes to save
next reply other threads:[~2018-05-09 13:32 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-09 13:25 KES [this message]
2018-05-09 13:27 ` Can not save changes into stash KES
2018-05-09 16:34 ` Torsten Bögershausen
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=6015131525872315@web37g.yandex.ru \
--to=kes-kes@yandex.ru \
--cc=git@vger.kernel.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.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox