{"thread":{"id":"48439","subject":"Can not save changes into stash","startedAt":"2018-05-09T13:32:17Z","lastAt":"2018-05-09T16:34:53Z","messageCount":3,"participants":["KES","Torsten Bögershausen"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"347077","messageId":"6015131525872315@web37g.yandex.ru","threadId":"48439","inReplyTo":null,"subject":"Can not save changes into stash","fromName":"KES","fromEmail":"kes-kes@yandex.ru","sentAt":"2018-05-09T13:25:15Z","receivedAt":"2018-05-09T13:32:17Z","isPatch":false,"sender":{"key":"kes-kes@yandex.ru","avatar":null},"body":"How to reproduce:\n\n$ git update-index --skip-worktree conf/local.conf\n$ git pull\nUpdating 0cd50c7..bde58f8\nerror: Your local changes to the following files would be overwritten by merge:\n\tconf/local.conf\nPlease commit your changes or stash them before you merge.\nAborting\n$ git stash save\nNo local changes to save\n\n"},{"id":"347078","messageId":"5718771525872436@web47o.yandex.ru","threadId":"48439","inReplyTo":"6015131525872315@web37g.yandex.ru","subject":"Re: Can not save changes into stash","fromName":"KES","fromEmail":"kes-kes@yandex.ru","sentAt":"2018-05-09T13:27:16Z","receivedAt":"2018-05-09T13:35:01Z","isPatch":false,"sender":{"key":"kes-kes@yandex.ru","avatar":null},"body":"I even can not drop local changes:\n\n$ git checkout local.conf \nerror: pathspec 'local.conf' did not match any file(s) known to git.\n\n$ git log local.conf\ncommit 6df8bab88fd703c6859954adc51b2abaad8f59ec\nAuthor: Eugen Konkov <kes-kes@yandex.ru>\nDate:   Wed May 9 15:31:02 2018 +0300\n\n    Implement module which allow override target option\n    \n    Most usefull to configure application on developer host\n\n\n\n09.05.2018, 16:25, \"KES\" <kes-kes@yandex.ru>:\n> How to reproduce:\n>\n> $ git update-index --skip-worktree conf/local.conf\n> $ git pull\n> Updating 0cd50c7..bde58f8\n> error: Your local changes to the following files would be overwritten by merge:\n>         conf/local.conf\n> Please commit your changes or stash them before you merge.\n> Aborting\n> $ git stash save\n> No local changes to save\n"},{"id":"347097","messageId":"7105a838-6c1f-97df-55c1-ea8312ddc9ab@web.de","threadId":"48439","inReplyTo":"5718771525872436@web47o.yandex.ru","subject":"Re: Can not save changes into stash","fromName":"Torsten Bögershausen","fromEmail":"tboegi@web.de","sentAt":"2018-05-09T16:34:44Z","receivedAt":"2018-05-09T16:34:53Z","isPatch":false,"sender":{"key":"tboegi@web.de","avatar":"https://avatars.githubusercontent.com/u/7138363?v=4"},"body":"[Please no top posting here]\nOn 09.05.18 15:27, KES wrote:\n> I even can not drop local changes:\n> \n> $ git checkout local.conf \n> error: pathspec 'local.conf' did not match any file(s) known to git.\n> \n> $ git log local.conf\n> commit 6df8bab88fd703c6859954adc51b2abaad8f59ec\n> Author: Eugen Konkov <kes-kes@yandex.ru>\n> Date:   Wed May 9 15:31:02 2018 +0300\n> \n>     Implement module which allow override target option\n>     \n>     Most usefull to configure application on developer host\n> \n> \nIt may be help, if we have some more information,\neither to re-produce your issue or to help with debugging.\n\nIs this a public repo ?\nWhich Git version do you use ?\nWhich OS (Linux, Mac OS, Windows anything else ?)\nWhat does \"git status\" say ?\nWhat does \"git diff\" say ?\n\n> \n> 09.05.2018, 16:25, \"KES\" <kes-kes@yandex.ru>:\n>> How to reproduce:\n>>\n>> $ git update-index --skip-worktree conf/local.conf\n>> $ git pull\n>> Updating 0cd50c7..bde58f8\n>> error: Your local changes to the following files would be overwritten by merge:\n>>         conf/local.conf\n>> Please commit your changes or stash them before you merge.\n>> Aborting\n>> $ git stash save\n>> No local changes to save\n\n"}]}