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

Stash Apply/Pop not restoring added files when conflict occurs on restore

From
AHAJ Henderson <ahenderson@datto.com>
Date
Jan 4, 2022, 19:00 UTC
Message-ID
<CACEm96jjWALB=iPiBNr0P5HrX9Oo3bXm_k1PpxsHm4Ns9M-vOQ@mail.gmail.com>

I have had two developers have this problem 3 times. When they are doing a stash push with newly created files and old files, when they go to do a stash pop, if there is no conflict, the files show up as expected, but when there is a conflict, the modified files are restored (and placed in a conflict state as expected), however, the new files are not restored.

We are able to work around this issue by grabbing the files directly out of the log for the stash head, but are unsure why this behavior isn't working as expected. It seems to be a new change in behavior as we had never previously seen this issue, but have seen it 3 times now in the last few weeks.

We are running 64 bit Windows with Git For Windows version 2.34.1.windows.1
Next: rsbecker@nexbridge.com
Message 1 of 3 in “Stash Apply/Pop not restoring added files when conflict occurs on restore”
  1. AJ HendersonJan 4, 2022
  2. rsbecker@nexbridge.comJan 4, 2022
  3. Eric SunshineJan 5, 2022

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.