GNU bug report logs - #20292
24.5; Saving Git-controlled file with merge conflicts after "stash pop" stages the file

Previous Next

Package: emacs;

Reported by: Eli Zaretskii <eliz <at> gnu.org>

Date: Fri, 10 Apr 2015 12:57:02 UTC

Severity: normal

Merged with 20151

Found in versions 24.5, 25.0.50

Done: Dmitry Gutov <dgutov <at> yandex.ru>

Bug is archived. No further changes may be made.

Full log

Message #37 received at 20292 <at> debbugs.gnu.org (full text, mbox):

From: Dmitry Gutov <dgutov <at> yandex.ru>
To: Eli Zaretskii <eliz <at> gnu.org>
Cc: esr <at> snark.thyrsus.com, 20292 <at> debbugs.gnu.org
Subject: Re: bug#20292: 24.5; Saving Git-controlled file with merge
 conflicts after "stash pop" stages the file
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
This bug report was last modified 8 years and 191 days ago.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.