Re: Can not save changes into stash

[Please no top posting here] On 09.05.18 15:27, KES wrote: > I even can not drop local changes: > > $ git checkout local.conf > error: pathspec 'local.conf' did not match any file(s) known to git. > > $ git log local.conf > commit 6df8bab88fd703c6859954adc51b2abaad8f59ec > Author: Eugen Konkov

Re: Can not save changes into stash

I even can not drop local changes: $ git checkout local.conf error: pathspec 'local.conf' did not match any file(s) known to git. $ git log local.conf commit 6df8bab88fd703c6859954adc51b2abaad8f59ec Author: Eugen Konkov Date: Wed May 9 15:31:02 2018 +0300 Implement

Can not save changes into stash

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