Re: git stash merge

Pawel Por writes: > I've just upgraded the linux kernel git source tree and I want to > "pop" my stashed work. I do the following: > git stash pop > > and I got the following message: > mm/Makefile: needs merge > unable to refresh index The symptom indicates that "upgraded the linux kernel git s

git stash merge

Hi, I've just upgraded the linux kernel git source tree and I want to "pop" my stashed work. I do the following: git stash pop and I got the following message: mm/Makefile: needs merge unable to refresh index I also tried: git stash pop --index How can I overcome this obstacle. I did "git stash