On 22/03/12 13:17, Randal L. Schwartz wrote:
"Zbigniew" == Zbigniew Jędrzejewski-Szmek<zbyszek@xxxxxxxxx> 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
<<attachment: smime.p7s>>