Resolving git ignore problems (3)