All of lore.kernel.org
 help / color / mirror / Atom feed
From: AJ Henderson <ahenderson@datto.com>
To: git@vger.kernel.org
Subject: Stash Apply/Pop not restoring added files when conflict occurs on restore
Date: Tue, 4 Jan 2022 14:00:26 -0500	[thread overview]
Message-ID: <CACEm96jjWALB=iPiBNr0P5HrX9Oo3bXm_k1PpxsHm4Ns9M-vOQ@mail.gmail.com> (raw)

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


             reply	other threads:[~2022-01-04 19:02 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-01-04 19:00 AJ Henderson [this message]
2022-01-04 21:05 ` Stash Apply/Pop not restoring added files when conflict occurs on restore rsbecker
2022-01-05  6:15 ` Eric Sunshine

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='CACEm96jjWALB=iPiBNr0P5HrX9Oo3bXm_k1PpxsHm4Ns9M-vOQ@mail.gmail.com' \
    --to=ahenderson@datto.com \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.