git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Can not save changes into stash

From
KKES <kes-kes@yandex.ru>
Date
May 9, 2018, 13:25 UTC
Message-ID
<6015131525872315@web37g.yandex.ru>
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: KES
Message 1 of 3 in “Can not save changes into stash”
  1. KESMay 9, 2018
  2. KESMay 9, 2018
  3. Torsten BögershausenMay 9, 2018

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.