From: Ralf Nyren <ralf.nyren@ericsson.com>
Date: Thu, 22 Mar 2012 12:39:40 GMT
Subject: Re: Strange effect merging empty file
Message-ID: <4F6B1D8C.9040500@ericsson.com>
In-Reply-To: <86iphwomnq.fsf@red.stonehenge.com>

On 22/03/12 13:17, Randal L. Schwartz wrote:
>>>>>> "Zbigniew" == Zbigniew Jędrzejewski-Szmek<zbyszek@in.waw.pl>  writes:
>
> Zbigniew>  touch .gitignore
>
> If you're doing this to make sure git makes an empty directory, always
> put the directory name in there as a comment... that makes it (a) not an
> empty file (so merge doesn't get confused) and (b) unique, so when you
> change it, merge won't try to change other similar empty files.

Good point.

Renaming directories makes the comment out-of-date but since uniqueness 
is what matters it should not be a problem.

regards, Ralf