From: Pawel Por <porparek@gmail.com>
Date: Mon, 20 Apr 2015 16:36:02 GMT
Subject: git stash merge
Message-ID: <CAJmOuEwEgA-9NCtBXjij-rLhsCWMyw+DcRVGo4=0b1V2nC==cA@mail.gmail.com>

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.