Re: How do I resolve conflict after popping stash without adding the file to index?

From: Jeff King <peff@peff.net>
Date: Apr 21, 2015, 21:29 UTC
Message-ID: <20150421212922.GC13230@peff.net>
In-Reply-To: <553583C0.6090404@yandex.ru>

On Tue, Apr 21, 2015 at 01:54:56AM +0300, Dmitry Gutov wrote:

Show 15 quoted lines

> I'm not really sure what "higher stage entries" are, but this scenario seems
> to be a counter-example:
> 
> git init
> echo "aaaaa" > test
> git add test
> git commit -m "first"
> echo "aaa" > test
> git stash save
> echo "bbbbb" > test
> git add test
> git stash pop
> 
> Either that, or 'git stash pop' was a destructive operation, and ate the
> staged changes.

Hmm, interestingly, if you do _not_ stage the changes (i.e., drop the final "git add" there), you get:

  $ git stash pop
  error: Your local changes to the following files would be overwritten by merge:
	test
  Please, commit your changes or stash them before you can merge.
  Aborting

which makes sense. Writing conflict markers into the file would leave you in a situation where it is hard to recover the "bbbbb" content.

But we seem to skip that safety valve when the content has been staged, which seems questionable to me (technically we are slightly better off than the protected case because "bbbbb" was written to a git blob object, so you can recover it. But it may be difficult to find the correct blob in the object database).

-Peff