From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 21 Mar 2011 19:32:08 GMT
Subject: Re: "git rm" is not a valid merge resolution?
Message-ID: <7vvczcp8w7.fsf@alter.siamese.dyndns.org>
In-Reply-To: <4D879882.4070608@gmail.com>

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

> 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?
>
> I would expect "git rm" to maybe reset all the merge changes but
> it seems to just delete the file.

Yes, if your side has a commit that updates a path since branches forked
(e.g. fixing a minor bug in an implementation of a function defined
there), and the other branch you are merging removed the path (e.g. fixing
a higher level callers and made that buggy function no longer necessary),
taking their removal can be a valid conflict resolution.