git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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

From
Dmitry Gutov <dgutov@yandex.ru>
Date
Apr 20, 2015, 22:54 UTC
Message-ID
<553583C0.6090404@yandex.ru>
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

Previous: Junio C HamanoNext: Jeff King
Message 3 of 14 in “How do I resolve conflict after popping stash without adding the file to index?”
  1. Dmitry GutovApr 20, 2015
  2. Junio C HamanoApr 20, 2015
  3. Dmitry GutovApr 20, 2015
  4. Jeff KingApr 21, 2015
  5. Dmitry GutovApr 21, 2015
  6. Jeff KingApr 21, 2015
  7. Junio C HamanoApr 22, 2015
  8. Jeff KingApr 22, 2015
  9. Jeff KingApr 22, 2015
  10. 1/3 t3903: stop hard-coding commit sha1sJeff King, Apr 22, 2015
  11. 2/3 t3903: avoid applying onto dirty indexJeff King, Apr 22, 2015
  12. 3/3 stash: require a clean index to applyJeff King, Apr 22, 2015
  13. Junio C HamanoApr 22, 2015
  14. Jeff KingApr 22, 2015

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.