On Wed, Jan 5, 2022 at 1:08 AM AJ Henderson <ahenderson@xxxxxxxxx> wrote: > 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. As a follow-up for anyone who comes across this thread in the future, Elijah posted a patch[*] to fix this regression. [*] https://lore.kernel.org/git/pull.1180.git.git.1641337498996.gitgitgadget@xxxxxxxxx/
