emacs-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: After a git merge and manual correction of a conflict, how do I tell


From: Kelvin White
Subject: Re: After a git merge and manual correction of a conflict, how do I tell git the conflict is fixed?
Date: Wed, 27 May 2015 00:45:14 +0000


On Tue, May 26, 2015, 8:39 PM Dmitry Gutov <address@hidden> wrote:

On 05/27/2015 03:36 AM, Kelvin White wrote:

> I created a new file in a directory under git version control, staged it
> with `git add <file>', them unstaged it with `git rm --cached <file>'.
> This is the same behavior you'd expect in this situation.

Well, it's not the same situation as what Alan has with .gitignore.


Indeed it is. Unstage the file, commit and move on...
If I'm missing something, I apologize in advance, but please explain.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]