|
From: | Stefan Monnier |
Subject: | bug#20292: 24.5; Saving Git-controlled file with merge conflicts after "stash pop" stages the file |
Date: | Sun, 19 Apr 2015 22:41:18 -0400 |
User-agent: | Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) |
>> If we can, yes. If not, this is way out of scope of the bug report. > Do you like the solution in d35f2f482273a822df695202f4a3bf1a5e473e63? My main use case is "git stash pop; then repeatedly call M-x vc-find-conflicted-files and resolve the conflicts (mostly with smerge's help)". I get the impression that with this change vc-find-conflicted-files won't work correctly any more, because the files will keep appearing as "conflicted", even after I've resolved all the conflicts in them. Stefan
[Prev in Thread] | Current Thread | [Next in Thread] |