Subject: Re: bug#20292: 24.5; Saving Git-controlled file with merge conflicts after "stash pop" stages the file

From: Dmitry Gutov <[email-masked]>
Date: Sun, 19 Apr 2015 21:11:49 +0300

On 04/19/2015 09:05 PM, Eli Zaretskii wrote:

> I was talking about the following simple scenatio:
>
>    git pull
>    # get an error about uncommitted changes that prevent merge
>    git stash save
>    git pull
>    git stash pop
>    # get an error message about conflicts
>    # resolve conflicts and save de-conflicted files

And I, about a related but slightly different one, which we'd prefer not 
to make worse, right?

     # edit foo.bar
     git stash save
     # edit foo.bar again, differently, maybe in several places
     git add foo.bar
     git stash pop
     # get an error message about conflict in foo.bar
     # resolve conflicts and save foo.bar