From: KES Date: Wed, 09 May 2018 13:27:16 GMT Subject: Re: Can not save changes into stash Message-ID: <5718771525872436@web47o.yandex.ru> In-Reply-To: <6015131525872315@web37g.yandex.ru> 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 module which allow override target option Most usefull to configure application on developer host 09.05.2018, 16:25, "KES" : > 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