On Mon, 20 Apr 2015 09:24:39 -0700 (PDT) Pawel Por <porpa...@gmail.com> wrote:
> 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". Well, IMO `git stash pop` merely told you it detected a conflict when trying to apply what you've stashed. Your work tree is now in conflicting state, and the stash wasn't dropped. All you have to do is resolve the conflict by editing mm/Makefile and `git add`-ing it to the index. Use `git status` + `git diff` to verify your changes from the stash entry actually landed into the work tree. If you feel uneasy about "merging" the stashed change, create a branch out of it (`git stash branch`) and merge those changes by merging the new branch. -- 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.
