GNU bug report logs - #20151
25.0.50; Smerge does "git add" for every final conflict resolution

Previous Next

Package: emacs;

Reported by: David Kastrup <dak <at> gnu.org>

Date: Fri, 20 Mar 2015 09:14:01 UTC

Severity: normal

Merged with 20292

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

View this message in rfc822 format

From: Stefan Monnier <monnier <at> IRO.UMontreal.CA>
To: David Kastrup <dak <at> gnu.org>
Cc: 20151 <at> debbugs.gnu.org
Subject: bug#20151: 25.0.50; Smerge does "git add" for every final conflict resolution
Date: Fri, 20 Mar 2015 10:29:17 -0400

> However, when the conflict occured as the result of "git stash pop"
> action in the work directory, the state of the index should not be
> touched: the whole point of using git stash is to store work directory
> and index separately and restore them separately.  So probably
> Smerge-mode would have to check whether a conflict is recorded in the
> index before overwriting it.

Sounds right.  Patch welcome,


        Stefan
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.