|
From: | Stefan Monnier |
Subject: | bug#20292: 24.5; Saving Git-controlled file with merge conflicts after "stash pop" stages the file |
Date: | Wed, 13 May 2015 09:04:16 -0400 |
User-agent: | Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) |
> What shall we do? Unstage the automatically-staged files? Revert the changes > from this bug? It seems Git really wants the changes staged after the > conflict resolution. IOW, the "resolve" step should always just use "git add", like we used to do. Yes, I think it's the right solution. Stefan
[Prev in Thread] | Current Thread | [Next in Thread] |