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

[Kelvin White]

Yes, from version control but not locally.

On Tue, May 26, 2015 at 10:03 PM Dmitry Gutov <address@hidden> wrote:

On 05/27/2015 04:57 AM, Kelvin White wrote:

> Maybe this can clarify my point better.
>
> http://stackoverflow.com/questions/5798930/git-rm-cached-x-vs-git-reset-head-x

This is the last sentence in the top answer:

"""
A commit now will sync the index and tree and the file will be removed.
"""