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

[Kelvin White]

Apologies, I'm using gmail on my mobile and it's not cutting me any slack at the moment

---------- Forwarded message ---------
From: Kelvin White <address@hidden>
Date: Tue, May 26, 2015, 7:17 PM
Subject: Re: After a git merge and manual correction of a conflict, how do I tell git the conflict is fixed?
To: Dmitry Gutov <address@hidden>, Alan Mackenzie <address@hidden>

This tidbit here I think is the part you want I think...

"git rm --cached <file>" would remove <file> from version control, while keeping it in the working repository.

On Tue, May 26, 2015, 7:14 PM Kelvin White <address@hidden> wrote:

Alan,

also look at this...

http://stackoverflow.com/questions/936249/stop-tracking-and-ignore-changes-to-a-file-in-git