From: Dmitry Gutov <dgutov@yandex•ru>
To: git@vger•kernel.org
Subject: How do I resolve conflict after popping stash without adding the file to index?
Date: Tue, 21 Apr 2015 00:02:54 +0300 [thread overview]
Message-ID: <5535697E.2030204@yandex.ru> (raw)
Hi all,
After the user does 'git stash pop', it may result in conflicts.
However, in many cases they may not intend to commit the stashed changes
right away, so staging the applied changes is often not what they intend
to do. However, the conflict is there until you mark it as resolved.
What's the proper thing to do there? 'git add file.ext' followed by 'git
reset file.ext'? Or simply 'git reset file.ext'?
Either will reset already-staged changes from the said file, which is an
irreversible operation.
Best regards,
Dmitry.
next reply other threads:[~2015-04-20 21:03 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-20 21:02 Dmitry Gutov [this message]
2015-04-20 21:11 ` How do I resolve conflict after popping stash without adding the file to index? Junio C Hamano
2015-04-20 22:54 ` Dmitry Gutov
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=5535697E.2030204@yandex.ru \
--to=dgutov@yandex$(echo .)ru \
--cc=git@vger$(echo .)kernel.org \
/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