Resolving git ignore problems (2)