From: Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Date: Mon, 21 Mar 2011 18:35:38 GMT
Subject: Re: "git rm" is not a valid merge resolution?
Message-ID: <vpqpqpk724l.fsf@bauges.imag.fr>
In-Reply-To: <4D879882.4070608@gmail.com>

Piotr Krukowiecki <piotr.krukowiecki@gmail.com> writes:

> Hi,
>
> git-status shows a hint that says
>     use "git add/rm <file>..." as appropriate to mark resolution
>  
> But if I "git rm file" the file gets deleted. Is this really the 
> appropriate merge resolution?

In most cases, no, but when you have a modify/delete conflict for
example, "git rm" is one of the candidates to resolve the conflict. The
hint gives the general case.

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/