Re: correct git merge behavior or corner case?

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi,

On Tue, 21 Apr 2009, Sverre Rabbelier wrote:

> On Tue, Apr 21, 2009 at 05:09, Junio C Hamano <gitster@xxxxxxxxx> wrote:
> > and sane projects would not have an empty file tracked anyway, so...
> 
> Except python projects that are full of empty __init__.py files.... no?

But they would be a good example why we do _not_ want rename detection 
there.

I actually agree with Junio, though, that we want this special handling of 
empty files only in merge-recursive.

Ciao,
Dscho

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]