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

Previous Next

Full log

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

From: Eli Zaretskii <eliz <at> gnu.org>
To: Stefan Monnier <monnier <at> iro.umontreal.ca>
Cc: esr <at> snark.thyrsus.com, 20292 <at> debbugs.gnu.org, dgutov <at> yandex.ru
Subject: Re: bug#20292: 24.5;
 Saving Git-controlled file with merge conflicts after "stash pop"
 stages the file
Date: Thu, 14 May 2015 17:53:44 +0300

> From: Stefan Monnier <monnier <at> iro.umontreal.ca>
> Cc: Dmitry Gutov <dgutov <at> yandex.ru>,  esr <at> snark.thyrsus.com,  20292 <at> debbugs.gnu.org
> Date: Wed, 13 May 2015 23:49:25 -0400
> 
> > is better than it was before the change.  Also note that conflicts
> > like this are quite rare,
> 
> It's about 99.9% of my "unstash-caused conflicts", so "rare" obviously
> depends on how you use Git.

Indeed.

May I ask why you have uncommitted changes when you pull (or do
whatever else requires to stash them)?  Why don't you commit them or
move them to a branch, or work on a branch to begin with?

Previous Next

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