I cannot apply stash back to the working directory.
Little story:
First I tried to push some committed changes, but it said: "no you can't, pull first"... OK then, I'll pull things from GitHub and then push my changes. When I tried to pull, it said that I had changes that would be overwritten, and that I should stash my changes. OK, I stashed the changes... did the pull, and push the committed changes. But now, I cannot restore the uncommitted changes I was working on.
This is the error:
MyPath/File.cs already exists, no checkout
Could not restore untracked files from stash
For sure I don't yet understand all the concepts of git, they confuse me a bit... maybe I did something wrong.
It would be great if someone could help me solve this... I've been searching google and everything for more than an hour now, and I didn't come to a solution yet.
Help is much appreciated. Thanks!
See Question&Answers more detail:
os 与恶龙缠斗过久,自身亦成为恶龙;凝视深渊过久,深渊将回以凝视…