Re: Strange effect merging empty file
From: Randal L. Schwartz <hidden>
Date: 2016-06-15 22:53:21
quoted
quoted
quoted
quoted
"Zbigniew" == Zbigniew Jędrzejewski-Szmek [off-list ref] 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 [off-list ref] <URL:http://www.stonehenge.com/merlyn/> Smalltalk/Perl/Unix consulting, Technical writing, Comedy, etc. etc. See http://methodsandmessages.posterous.com/ for Smalltalk discussion