git cherry-pick says local changes exist, but git status says nothing

Question

$ git cherry-pick 5de83068
error: Your local changes to the following files would be overwritten by merge:
        Components/ApplicationEnums/Application.cs
Please, commit yo         


        

Answer 1

I came here from googling about that weird message and I'd like to put my two cents.

For what is worth, my scenario is as following:

• real code resides in a Virtual Machine
• Mac OS connects to it via samba network sharing
• Visual Studio Code is running on my Mac
• git is running from within VS Code

I did experienced what OP wrote and I resolved by doing... nothing but wait! :)

Maybe there was a cache or a network problem, who knows.