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

Behavior of stash apply vs merge

From
Robin Rosenberg <robin.rosenberg@dewire.com>
Date
Jan 27, 2013, 11:35 UTC
Message-ID
<61173190.1700449.1359286556865.JavaMail.root@dewire.com>
In-Reply-To
<1192924141.1697155.1359285809347.JavaMail.root@dewire.com>
Hi,
What good reason is it that 'git stash apply' gives hairy conflict markers, while 'git merge stash' does not. No renames involved.
-- robin
Next: Junio C Hamano
Message 1 of 5 in “Behavior of stash apply vs merge”
  1. Robin RosenbergJan 27, 2013
  2. Junio C HamanoJan 27, 2013
  3. Robin RosenbergJan 27, 2013
  4. Junio C HamanoJan 27, 2013
  5. Robin RosenbergJan 27, 2013

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.