From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 20 Apr 2015 21:11:22 GMT
Subject: Re: How do I resolve conflict after popping stash without adding the file to index?
Message-ID: <xmqqsibujyit.fsf@gitster.dls.corp.google.com>
In-Reply-To: <5535697E.2030204@yandex.ru>

Dmitry Gutov <dgutov@yandex.ru> writes:

> Either will reset already-staged changes from the said file, which is
> an irreversible operation.

But the said file, if it had conflicted, would have had only the
conflicted higher stage entries in the index, no?  That is, the
failed merge wouldn't have touched the index for the path if it
already had changes there in the first place.

If you want to keep them then you do not have to reset, but your
question is about resolving conflict only in the working tree and
leave the index clean, so I do not think "git reset -- $path" would
not lose anything "irreversibly".