Re: [git-users] git stash merge

2015-04-20 Thread Konstantin Khomoutov
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

[git-users] git stash merge

2015-04-20 Thread Pawel Por
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