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'm not quite sure whats the problem but you can reset your working copy with the follwing statement:

git reset --hard origin/master