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" before "git pull".

Thanks for help.

You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Reply via email to