Re: [PATCHv5 3/3] status: don't suggest "git rm" or "git add" if not appropriate

From: Junio C Hamano <gitster@pobox.com>
Date: Jun 1, 2012, 16:38 UTC
Message-ID: <7vbol33s31.fsf@alter.siamese.dyndns.org>
In-Reply-To: <20120601160808.Horde.ij8nYXwdC4BPyMzILrtjxYA@webmail.minatec.grenoble-inp.fr>

konglu@minatec.inpg.fr writes:

Show 8 quoted lines

> If both sides delete the same file with "git rm", this case does not occur
> because there is no conflict when merging. However, it can occur when
> both sides rename the file and then merge.
>
>> As this patch highlights, the only expected resolution is to 'git rm'
>> the file; why can't git figure this out for me and continue on?
>
> I agree. The only option for the user is to run "git rm".

If both sides remove the path A and one side creates a similar looking B but the other side does so for C, it is clear that neither side wants A in the result, so the only option FOR THE PATH A is to run "git rm".

But when looking at B and C to decide, it would help knowing that the corresponding source of these renames is potentially A. If we auto-resolved A, we would lose that information, no?

You need to look at a larger picture.