git/list[1] front-page[2] threads[3] people[4] search[5] about
 

git stash merge

From
PPPawel Por <porparek@gmail.com>
Date
Apr 20, 2015, 16:36 UTC
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.
Next: Junio C Hamano
Message 1 of 2 in “git stash merge”
  1. Pawel PorApr 20, 2015
  2. Junio C HamanoApr 20, 2015

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.