[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#20151: 25.0.50; Smerge does "git add" for every final conflict resol
|
From: |
Stefan Monnier |
|
Subject: |
bug#20151: 25.0.50; Smerge does "git add" for every final conflict resolution |
|
Date: |
Fri, 20 Mar 2015 10:29:17 -0400 |
|
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) |
> 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