|
From: | Harald Hanche-Olsen |
Subject: | Re: VC mode and git |
Date: | Sun, 05 Apr 2015 11:55:24 +0200 |
User-agent: | Postbox 3.0.11 (Macintosh/20140602) |
Eli Zaretskii wrote:
Yes, something like that. In fact, I think the root cause of the original problem was that "C-x v v", which tried to commit a single file in the middle of a merge. Instead, the correct action is either 'v' from vc-dir or "git commit" from the shell prompt. It would be good if "C-x v v" tried to support this situation better. I hope Eric Raymond is reading this.
You need to detect the fact that a merge is underway. Is the existence of .git/MERGE_HEAD a reliable indicator of this?
– Harald
[Prev in Thread] | Current Thread | [Next in Thread] |