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

Previous Next

Full log

View this message in rfc822 format

From: Eli Zaretskii <eliz <at> gnu.org>
To: Dmitry Gutov <dgutov <at> yandex.ru>
Cc: esr <at> snark.thyrsus.com, 20292 <at> debbugs.gnu.org
Subject: bug#20292: 24.5; Saving Git-controlled file with merge conflicts after "stash pop" stages the file
Date: Sun, 19 Apr 2015 21:25:38 +0300

> Date: Sun, 19 Apr 2015 21:11:49 +0300
> From: Dmitry Gutov <dgutov <at> yandex.ru>
> CC: esr <at> snark.thyrsus.com, 20292 <at> debbugs.gnu.org
> 
> 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

If we can, yes.  If not, this is way out of scope of the bug report.

Previous Next

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