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

[Kelvin White]

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

On 05/27/2015 03:21 AM, Kelvin White wrote:
> but in any case `git rm --cached <file>', certainly will.

Have you tried it?

Yes actually, I did try it.

That will stage the file for removal, which is almost certainly not what
one would want.

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.