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" before "git pull". Thanks for help. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
