[git-users] Can't restore from stash

2013-03-03 Thread Tom Green
I did a GIT STASH (working in Windows command line). Now I can't restore from it I get the message: TECHNOTE/git.TXT: needs merge unable to refresh index I tried commiting that file and I tried deleting it, but I still get the same problem. I really don't care about that particular

Re: [git-users] Can't restore from stash

2013-03-03 Thread Konstantin Khomoutov
On Sun, 3 Mar 2013 09:27:03 -0800 (PST) Tom Green tomgreen1...@gmail.com wrote: I did a GIT STASH (working in Windows command line). Now I can't restore from it I get the message: TECHNOTE/git.TXT: needs merge unable to refresh index I tried commiting that file and I tried