From: Dmitry Gutov <dgutov@yandex•ru>
To: Junio C Hamano <gitster@pobox•com>
Cc: git@vger•kernel.org
Subject: Re: How do I resolve conflict after popping stash without adding the file to index?
Date: Tue, 21 Apr 2015 01:54:56 +0300 [thread overview]
Message-ID: <553583C0.6090404@yandex.ru> (raw)
In-Reply-To: <xmqqsibujyit.fsf@gitster.dls.corp.google.com>
On 04/21/2015 12:11 AM, Junio C Hamano wrote:
> 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.
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.
> 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".
Rather, I'd prefer to leave the index as-is, if it makes sense.
Basically, this is about tool automation, see the context here:
http://debbugs.gnu.org/cgi/bugreport.cgi?bug=20292
next prev parent reply other threads:[~2015-04-20 22:55 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-20 21:02 How do I resolve conflict after popping stash without adding the file to index? Dmitry Gutov
2015-04-20 21:11 ` Junio C Hamano
2015-04-20 22:54 ` Dmitry Gutov [this message]
2015-04-21 21:29 ` Jeff King
2015-04-21 22:35 ` Dmitry Gutov
2015-04-21 22:52 ` Jeff King
2015-04-22 17:41 ` Junio C Hamano
2015-04-22 18:35 ` Jeff King
2015-04-22 19:29 ` Jeff King
2015-04-22 19:30 ` [PATCH 1/3] t3903: stop hard-coding commit sha1s Jeff King
2015-04-22 19:30 ` [PATCH 2/3] t3903: avoid applying onto dirty index Jeff King
2015-04-22 19:31 ` [PATCH 3/3] stash: require a clean index to apply Jeff King
2015-04-22 19:45 ` How do I resolve conflict after popping stash without adding the file to index? Junio C Hamano
2015-04-22 19:55 ` Jeff King
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=553583C0.6090404@yandex.ru \
--to=dgutov@yandex$(echo .)ru \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox