Re: Can not save changes into stash

From: Torsten Bögershausen <tboegi@web.de>
Date: May 9, 2018, 16:34 UTC
Message-ID: <7105a838-6c1f-97df-55c1-ea8312ddc9ab@web.de>
In-Reply-To: <5718771525872436@web47o.yandex.ru>

[Please no top posting here] On 09.05.18 15:27, KES wrote:

Show 15 quoted lines

> 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 <kes-kes@yandex.ru>
> Date:   Wed May 9 15:31:02 2018 +0300
> 
>     Implement module which allow override target option
>     
>     Most usefull to configure application on developer host
> 
>

It may be help, if we have some more information, either to re-produce your issue or to help with debugging.

Is this a public repo ? Which Git version do you use ? Which OS (Linux, Mac OS, Windows anything else ?) What does "git status" say ? What does "git diff" say ?

Show 13 quoted lines

> 
> 09.05.2018, 16:25, "KES" <kes-kes@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