From: Randal L. Schwartz <merlyn@stonehenge.com>
Date: Thu, 22 Mar 2012 12:17:13 GMT
Subject: Re: Strange effect merging empty file
Message-ID: <86iphwomnq.fsf@red.stonehenge.com>
In-Reply-To: <4F69B375.5050205@in.waw.pl>

>>>>> "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.

-- 
Randal L. Schwartz - Stonehenge Consulting Services, Inc. - +1 503 777 0095
<merlyn@stonehenge.com> <URL:http://www.stonehenge.com/merlyn/>
Smalltalk/Perl/Unix consulting, Technical writing, Comedy, etc. etc.
See http://methodsandmessages.posterous.com/ for Smalltalk discussion