You can rename `.gitkeep` to `.gitignore` and both be happy in that case.