|
From: | Stefan Monnier |
Subject: | bug#20292: 24.5; Saving Git-controlled file with merge conflicts after "stash pop" stages the file |
Date: | Sat, 16 May 2015 09:48:58 -0400 |
User-agent: | Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) |
>> and AFAIK those cases can't be distinguished solely based on the >> state of the current file but also depend on the other files in >> the project. > That's not a problem, we have vc-git-root. It's not a theoretical problem, no, but it's a practical/programming problem in that someone has to write the code, and the resulting code will be that much more brittle and inefficient. Stefan
[Prev in Thread] | Current Thread | [Next in Thread] |