From: konglu@minatec.inpg.fr
Date: Thu, 31 May 2012 07:59:14 GMT
Subject: Re: [PATCHv4 3/3] Advices about 'git rm' during conflicts (unmerged paths) more relevant
Message-ID: <20120531095914.Horde.McdhLnwdC4BPxyTSG9v3ctA@webmail.minatec.grenoble-inp.fr>
In-Reply-To: <vpq7gvsrfr0.fsf@bauges.imag.fr>


Matthieu Moy <Matthieu.Moy@grenoble-inp.fr> a écrit :

>> Subject: Re: [PATCHv4 3/3] Advices about 'git rm' during conflicts  
>> (unmerged paths) more relevant
>
> "more relevant" doesn't say much, and your subject line doesn't say it's
> about "status". What about
>
> status: don't suggest "git rm" if not appropriate
>
> ?
In the case of only 'both deleted', what we don't want 'git status' to suggest
is "git add". Maybe something like

status: advices appropriated during conflicts
or
status: don't suggest "git rm" or "git add" if not appropriate

would fit.